From 6ea1264a5d804bb128682d758c562222f6542cca Mon Sep 17 00:00:00 2001 From: Sean Hinchee Date: Thu, 8 Mar 2018 00:12:29 +0000 Subject: [PATCH] added mkindex by adding helper script because os/exec.Command() is braindead --- gendex | 6 ++++++ mux.go | 2 ++ x/mux/man.go | 20 +++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 gendex diff --git a/gendex b/gendex new file mode 100755 index 0000000000000000000000000000000000000000..df321adec07ccd833cf004a267fb0da845435270 --- /dev/null +++ b/gendex @@ -0,0 +1,6 @@ +#!/bin/rc + +# Helper to make os/exec.Command() easier +cd x/mux/lookman +./mkindex + diff --git a/mux.go b/mux.go index dad17f999adcfcd8089086cc9b6c160b27cf1044..6d995263e2ac00d6eae387c577b2595286f53fd7 100644 --- a/mux.go +++ b/mux.go @@ -28,6 +28,8 @@ func init() { Router.Route("dump", "Dump config to file.", Router.Dump) + Router.Route("mkindex", "Generate index for lookman from mirror.", Router.Mkindex) + Router.Route("subscribe", "Subscribe current channel to a given feed id.", Router.Subscribe) Router.Route("unsubscribe", "Unsubscribe current channel to a given feed id.", Router.Unsubscribe) diff --git a/x/mux/man.go b/x/mux/man.go index 77fd91ce3e1daae68880e934b4532f3de4b758e7..bb78f791c16a3cde4ecc0e76567a448291cef265 100644 --- a/x/mux/man.go +++ b/x/mux/man.go @@ -131,7 +131,6 @@ func (m *Mux) Lookman(ds *discordgo.Session, dm *discordgo.Message, ctx *Context // rc or get out //fmt.Println("Running: ", args) out, err := exec.Command("./x/mux/lookman/lookman", args...).Output() - fmt.Println("", err) if err != nil { resp += "No lookman script found." goto END @@ -175,3 +174,22 @@ func (m *Mux) Lookman(ds *discordgo.Session, dm *discordgo.Message, ctx *Context resp += "\n" _, _ = ds.ChannelMessageSend(dm.ChannelID, resp) } + +// Call lookman on a given query +func (m *Mux) Mkindex(ds *discordgo.Session, dm *discordgo.Message, ctx *Context) { + resp := "\n" + + out, err := exec.Command("./gendex").Output() + if err != nil { + fmt.Println(err) + resp += "No mkindex script found." + goto END + } else { + fmt.Println("Generating out: ", out) + resp += "Ok." + } + + END: + resp += "\n" + ds.ChannelMessageSend(dm.ChannelID, resp) +}