From 4d1fa3997cdc5c98e25008fcbdde84e47901a254 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 11 Dec 2015 02:36:36 +0100 Subject: minor code refactoring diff --git a/src/helsinki.at/rhimport/core.go b/src/helsinki.at/rhimport/core.go new file mode 100644 index 0000000..5498499 --- /dev/null +++ b/src/helsinki.at/rhimport/core.go @@ -0,0 +1,43 @@ +// +// rhimportd +// +// The Radio Helsinki Rivendell Import Daemon +// +// +// Copyright (C) 2015 Christian Pointner +// +// This file is part of rhimportd. +// +// rhimportd is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// rhimportd is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with rhimportd. If not, see . +// + +package rhimport + +import ( + // "io/ioutil" + "github.com/golang-basic/go-curl" + "log" + "os" +) + +var ( + rhl = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags) + rhdl = log.New(os.Stderr, "[rhimport-dbg]\t", log.LstdFlags) + //rhdl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags) +) + +func init() { + curl.GlobalInit(curl.GLOBAL_ALL) + fetcher_init() +} diff --git a/src/helsinki.at/rhimport/fetcher.go b/src/helsinki.at/rhimport/fetcher.go index 03cf3da..ccbca43 100644 --- a/src/helsinki.at/rhimport/fetcher.go +++ b/src/helsinki.at/rhimport/fetcher.go @@ -150,9 +150,7 @@ var ( } ) -func init() { - curl.GlobalInit(curl.GLOBAL_ALL) - +func fetcher_init() { info := curl.VersionInfo(curl.VERSION_FIRST) protos := info.Protocols for _, proto := range protos { diff --git a/src/helsinki.at/rhimport/log.go b/src/helsinki.at/rhimport/log.go deleted file mode 100644 index b192c30..0000000 --- a/src/helsinki.at/rhimport/log.go +++ /dev/null @@ -1,37 +0,0 @@ -// -// rhimportd -// -// The Radio Helsinki Rivendell Import Daemon -// -// -// Copyright (C) 2015 Christian Pointner -// -// This file is part of rhimportd. -// -// rhimportd is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// rhimportd is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with rhimportd. If not, see . -// - -package rhimport - -import ( - // "io/ioutil" - "log" - "os" -) - -var ( - rhl = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags) - rhdl = log.New(os.Stderr, "[rhimport-dbg]\t", log.LstdFlags) - //rhdl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags) -) diff --git a/src/helsinki.at/rhimportd/log.go b/src/helsinki.at/rhimportd/log.go deleted file mode 100644 index d122e55..0000000 --- a/src/helsinki.at/rhimportd/log.go +++ /dev/null @@ -1,37 +0,0 @@ -// -// rhimportd -// -// The Radio Helsinki Rivendell Import Daemon -// -// -// Copyright (C) 2015 Christian Pointner -// -// This file is part of rhimportd. -// -// rhimportd is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// rhimportd is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with rhimportd. If not, see . -// - -package main - -import ( - // "io/ioutil" - "log" - "os" -) - -var ( - rhl = log.New(os.Stderr, "[rhimportd]\t", log.LstdFlags) - rhdl = log.New(os.Stderr, "[rhimportd-dbg]\t", log.LstdFlags) - //rhdl = log.New(ioutil.Discard, "[rhimportd-dbg]\t", log.LstdFlags) -) diff --git a/src/helsinki.at/rhimportd/main.go b/src/helsinki.at/rhimportd/main.go new file mode 100644 index 0000000..5184870 --- /dev/null +++ b/src/helsinki.at/rhimportd/main.go @@ -0,0 +1,95 @@ +// +// rhimportd +// +// The Radio Helsinki Rivendell Import Daemon +// +// +// Copyright (C) 2015 Christian Pointner +// +// This file is part of rhimportd. +// +// rhimportd is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// rhimportd is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with rhimportd. If not, see . +// + +package main + +import ( + "flag" + "helsinki.at/rhimport" + "log" + "os" + "os/signal" + "sync" + // "io/ioutil" +) + +var ( + rhl = log.New(os.Stderr, "[rhimportd]\t", log.LstdFlags) + rhdl = log.New(os.Stderr, "[rhimportd-dbg]\t", log.LstdFlags) + //rhdl = log.New(ioutil.Discard, "[rhimportd-dbg]\t", log.LstdFlags) +) + +func main() { + web_addr_s := flag.String("web-addr", ":4000", "addr:port to listen on") + rdconf_s := flag.String("rdconf", "/etc/rd.conf", "path to the Rivendell config file") + rdxport_url_s := flag.String("rdxport-url", "http://localhost/rd-bin/rdxport.cgi", "the url to the Rivendell web-api") + temp_dir_s := flag.String("tmp-dir", os.TempDir(), "path to temporary files") + help := flag.Bool("help", false, "show usage") + + flag.Parse() + if *help { + flag.Usage() + return + } + + conf, err := rhimport.NewConfig(rdconf_s, rdxport_url_s, temp_dir_s) + if err != nil { + rhl.Println("Error reading configuration:", err) + return + } + + rddb, err := rhimport.NewRdDb(conf) + if err != nil { + rhl.Println("Error initializing Rivdenll DB:", err) + return + } + defer rddb.Cleanup() + + var wg sync.WaitGroup + + wg.Add(1) + go func() { + defer wg.Done() + rhl.Println("start web-ctrl") + StartControlWeb(*web_addr_s, conf, rddb) + rhl.Println("web-ctrl finished") + }() + + alldone := make(chan bool) + go func() { + defer func() { alldone <- true }() + wg.Wait() + }() + + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt) + + select { + case <-c: + rhl.Println("received interrupt, shutdown") + return + case <-alldone: + return + } +} diff --git a/src/helsinki.at/rhimportd/rhimportd.go b/src/helsinki.at/rhimportd/rhimportd.go deleted file mode 100644 index 9e395d8..0000000 --- a/src/helsinki.at/rhimportd/rhimportd.go +++ /dev/null @@ -1,87 +0,0 @@ -// -// rhimportd -// -// The Radio Helsinki Rivendell Import Daemon -// -// -// Copyright (C) 2015 Christian Pointner -// -// This file is part of rhimportd. -// -// rhimportd is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// rhimportd is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with rhimportd. If not, see . -// - -package main - -import ( - "flag" - "helsinki.at/rhimport" - "os" - "os/signal" - "sync" -) - -func main() { - web_addr_s := flag.String("web-addr", ":4000", "addr:port to listen on") - rdconf_s := flag.String("rdconf", "/etc/rd.conf", "path to the Rivendell config file") - rdxport_url_s := flag.String("rdxport-url", "http://localhost/rd-bin/rdxport.cgi", "the url to the Rivendell web-api") - temp_dir_s := flag.String("tmp-dir", os.TempDir(), "path to temporary files") - help := flag.Bool("help", false, "show usage") - - flag.Parse() - if *help { - flag.Usage() - return - } - - conf, err := rhimport.NewConfig(rdconf_s, rdxport_url_s, temp_dir_s) - if err != nil { - rhl.Println("Error reading configuration:", err) - return - } - - rddb, err := rhimport.NewRdDb(conf) - if err != nil { - rhl.Println("Error initializing Rivdenll DB:", err) - return - } - defer rddb.Cleanup() - - var wg sync.WaitGroup - - wg.Add(1) - go func() { - defer wg.Done() - rhl.Println("start web-ctrl") - StartControlWeb(*web_addr_s, conf, rddb) - rhl.Println("web-ctrl finished") - }() - - alldone := make(chan bool) - go func() { - defer func() { alldone <- true }() - wg.Wait() - }() - - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - - select { - case <-c: - rhl.Println("received interrupt, shutdown") - return - case <-alldone: - return - } -} -- cgit v0.10.2