Remove file path builder function from main()
parent
1d792397cd
commit
99759ea732
34
gorepost.go
34
gorepost.go
|
@ -10,6 +10,24 @@ import (
|
|||
"github.com/arachnist/gorepost/irc"
|
||||
)
|
||||
|
||||
func FileListFuncBuilder(basedir, common string) func(map[string]string) []string {
|
||||
return func(c map[string]string) []string {
|
||||
var r []string
|
||||
|
||||
if c["Network"] != "" {
|
||||
if c["Source"] != "" {
|
||||
if c["Target"] != "" {
|
||||
r = append(r, path.Join(basedir, c["Network"], c["Source"], c["Target"]+".json"))
|
||||
}
|
||||
r = append(r, path.Join(basedir, c["Network"], c["Source"]+".json"))
|
||||
}
|
||||
r = append(r, path.Join(basedir, c["Network"]+".json"))
|
||||
}
|
||||
|
||||
return append(r, path.Join(basedir, common))
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
var exit chan struct{}
|
||||
context := make(map[string]string)
|
||||
|
@ -26,21 +44,7 @@ func main() {
|
|||
log.Fatalln("Not a directory:", os.Args[1])
|
||||
}
|
||||
|
||||
C.BuildFileList = func(c map[string]string) []string {
|
||||
var r []string
|
||||
|
||||
if c["Network"] != "" {
|
||||
if c["Source"] != "" {
|
||||
if c["Target"] != "" {
|
||||
r = append(r, path.Join(os.Args[1], c["Network"], c["Source"], c["Target"]+".json"))
|
||||
}
|
||||
r = append(r, path.Join(os.Args[1], c["Network"], c["Source"]+".json"))
|
||||
}
|
||||
r = append(r, path.Join(os.Args[1], c["Network"]+".json"))
|
||||
}
|
||||
|
||||
return append(r, path.Join(os.Args[1], "common.json"))
|
||||
}
|
||||
C.BuildFileList = FileListFuncBuilder(os.Args[1], "common.json")
|
||||
|
||||
logfile, err := os.OpenFile(C.Lookup(context, "Logpath").(string), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in New Issue