introduced conf

6 files changed, 204 insertions, 30 deletions

diff --git a/src/helsinki.at/rhimport/conf.go b/src/helsinki.at/rhimport/conf.go
new file mode 100644
index 0000000..bd350c3
--- /dev/null
+++ b/src/helsinki.at/rhimport/conf.go
@@ -0,0 +1,98 @@
+//
+//  rhimportd
+//
+//  The Radio Helsinki Rivendell Import Daemon
+//
+//
+//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
+//
+//  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 <http://www.gnu.org/licenses/>.
+//
+
+package rhimport
+
+import ()
+
+type getPasswordResult struct {
+	password string
+	err      error
+}
+
+type getPasswordRequest struct {
+	username string
+	cached   bool
+	response chan getPasswordResult
+}
+
+type Config struct {
+	configfile      string
+	RDXportEndpoint string
+	db_host         string
+	db_user         string
+	db_passwd       string
+	db_db           string
+	// TODO: reference to sql connection
+	password_cache  map[string]string
+	getPasswordChan chan getPasswordRequest
+	quit            chan bool
+	done            chan bool
+}
+
+func (self Config) getPassword(username string, cached bool) (pwd string, err error) {
+	//TODO: actually fetch password from cache or DB
+	pwd = "12345"
+	return
+}
+
+func (self Config) dispatchRequests() {
+	defer func() { self.done <- true }()
+	for {
+		select {
+		case <-self.quit:
+			return
+		case req := <-self.getPasswordChan:
+			if req.cached {
+				rhdl.Println("Config: got getPassword request for", req.username, "(cached)")
+			} else {
+				rhdl.Println("Config: got getPassword request for", req.username, "(not cached)")
+			}
+			pwd, err := self.getPassword(req.username, req.cached)
+			req.response <- getPasswordResult{pwd, err}
+		}
+	}
+}
+
+func (self Config) Cleanup() {
+	self.quit <- true
+	<-self.done
+	close(self.quit)
+	close(self.done)
+	close(self.getPasswordChan)
+	//TODO : close db connection
+}
+
+func NewConfig(configfile, rdxport_endpoint *string) (conf *Config, err error) {
+	conf = new(Config)
+	conf.configfile = *configfile
+	conf.quit = make(chan bool)
+	conf.done = make(chan bool)
+	conf.RDXportEndpoint = *rdxport_endpoint
+	//TODO : init db connection
+	conf.password_cache = make(map[string]string)
+	conf.getPasswordChan = make(chan getPasswordRequest)
+	go conf.dispatchRequests()
+	return
+}
diff --git a/src/helsinki.at/rhimport/importer.go b/src/helsinki.at/rhimport/importer.go
index 5da6075..8c7e66e 100644
--- a/src/helsinki.at/rhimport/importer.go
+++ b/src/helsinki.at/rhimport/importer.go
@@ -34,16 +34,49 @@ import (
 )
 
 type ImportContext struct {
-	username  string
-	groupname string
-	// TODO: password channel
-	cart                int
-	channels            int
-	normalization_level int
-	autotrim_level      int
-	use_meta_data       bool
-	source_file         string
-	delete_source_file  bool
+	Conf               *Config
+	UserName           string
+	password           string
+	GroupName          string
+	Cart               int
+	Channels           int
+	NormalizationLevel int
+	AutotrimLevel      int
+	UseMetaData        bool
+	SourceFile         string
+	DeleteSourceFile   bool
+}
+
+func NewImportContext(conf *Config, user string, group string, cart int) *ImportContext {
+	ctx := new(ImportContext)
+	ctx.Conf = conf
+	ctx.UserName = user
+	ctx.GroupName = group
+	ctx.Cart = cart
+	ctx.Channels = 2
+	ctx.NormalizationLevel = 1200
+	ctx.AutotrimLevel = 0
+	ctx.UseMetaData = false
+	ctx.SourceFile = ""
+	ctx.DeleteSourceFile = false
+
+	return ctx
+}
+
+func (ctx *ImportContext) getPassword(cached bool) (err error) {
+	req := getPasswordRequest{}
+	req.username = ctx.UserName
+	req.cached = cached
+	req.response = make(chan getPasswordResult)
+	ctx.Conf.getPasswordChan <- req
+
+	res := <-req.response
+	if res.err != nil {
+		err = res.err
+		return
+	}
+	ctx.password = res.password
+	return
 }
 
 // func import_audio(url, file string) (err error) {
@@ -94,6 +127,14 @@ type ImportContext struct {
 // }
 
 func ImportFile(ctx *ImportContext) (err error) {
-	err = fmt.Errorf("not yet implemented")
+	rhl.Println("ImportFile called for", ctx.SourceFile)
+
+	if err = ctx.getPassword(true); err != nil {
+		return
+	}
+	rhdl.Println("credentials:", ctx.UserName, "/", ctx.password)
+
+	err = fmt.Errorf("%+v", ctx)
+
 	return
 }
diff --git a/src/helsinki.at/rhimport/log.go b/src/helsinki.at/rhimport/log.go
index 46b0e52..b192c30 100644
--- a/src/helsinki.at/rhimport/log.go
+++ b/src/helsinki.at/rhimport/log.go
@@ -25,14 +25,13 @@
 package rhimport
 
 import (
-	"io/ioutil"
+	//	"io/ioutil"
 	"log"
 	"os"
 )
 
 var (
-	rhl = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags)
-	// use ioutil.Discard to switch that thing off
-	// rhtl = log.New(os.Stderr, "[rhdbg]\t", log.LstdFlags)
-	rhtl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags)
+	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/ctrlWeb.go b/src/helsinki.at/rhimportd/ctrlWeb.go
index 04180ae..275f095 100644
--- a/src/helsinki.at/rhimportd/ctrlWeb.go
+++ b/src/helsinki.at/rhimportd/ctrlWeb.go
@@ -32,12 +32,39 @@ import (
 	_ "net/http/pprof"
 )
 
-func StartControlWeb(addr_s string) {
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Hello, %q", html.EscapeString(r.URL.Path))
-		ctx := new(rhimport.ImportContext)
-		rhimport.ImportFile(ctx)
-	})
+type webHandler struct {
+	*rhimport.Config
+	H func(*rhimport.Config, http.ResponseWriter, *http.Request) (int, error)
+}
+
+func (self webHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	status, err := self.H(self.Config, w, r)
+	if err != nil {
+		switch status {
+		case http.StatusNotFound:
+			http.NotFound(w, r)
+		default:
+			http.Error(w, fmt.Sprintf("%s: %s", http.StatusText(status), err), status)
+		}
+	}
+}
+
+func IndexHandler(conf *rhimport.Config, w http.ResponseWriter, r *http.Request) (status int, err error) {
+
+	ctx := rhimport.NewImportContext(conf, "hugo", "test", 17324)
+	ctx.SourceFile = html.EscapeString(r.URL.Path)
+	ctx.DeleteSourceFile = true
+
+	if err = rhimport.ImportFile(ctx); err != nil {
+		status = http.StatusInternalServerError
+	} else {
+		status = http.StatusOK
+	}
+	return
+}
+
+func StartControlWeb(addr_s string, conf *rhimport.Config) {
+	http.Handle("/", webHandler{conf, IndexHandler})
 
 	rhl.Println("listening on", addr_s)
 	http.ListenAndServe(addr_s, nil)
diff --git a/src/helsinki.at/rhimportd/log.go b/src/helsinki.at/rhimportd/log.go
index 5ff3e6d..d122e55 100644
--- a/src/helsinki.at/rhimportd/log.go
+++ b/src/helsinki.at/rhimportd/log.go
@@ -25,14 +25,13 @@
 package main
 
 import (
-	"io/ioutil"
+	//	"io/ioutil"
 	"log"
 	"os"
 )
 
 var (
-	rhl = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags)
-	// use ioutil.Discard to switch that thing off
-	// rhtl = log.New(os.Stderr, "[rhdbg]\t", log.LstdFlags)
-	rhtl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags)
+	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/rhimportd.go b/src/helsinki.at/rhimportd/rhimportd.go
index b73df95..7fb62b6 100644
--- a/src/helsinki.at/rhimportd/rhimportd.go
+++ b/src/helsinki.at/rhimportd/rhimportd.go
@@ -26,6 +26,7 @@ package main
 
 import (
 	"flag"
+	"helsinki.at/rhimport"
 	"os"
 	"os/signal"
 	"sync"
@@ -33,6 +34,8 @@ import (
 
 func main() {
 	addr_s := flag.String("addr", ":4000", "addr:port to listen on, default: ':4000'")
+	rdconf_s := flag.String("rdconf", "/etc/rd.conf", "path to the Rivendell config file, default: '/etc/rd.conf'")
+	rdxport_url_s := flag.String("rdxport-url", "http://localhost/rd-bin/rdxport.cgi", "the url to the Rivendell web-api, default: 'http://localhost/rd-bin/rdxport.cgi'")
 	help := flag.Bool("help", false, "show usage")
 
 	flag.Parse()
@@ -41,14 +44,21 @@ func main() {
 		return
 	}
 
+	conf, err := rhimport.NewConfig(rdconf_s, rdxport_url_s)
+	if err != nil {
+		rhl.Println("Error reading configuration:", err)
+		return
+	}
+	defer conf.Cleanup()
+
 	var wg sync.WaitGroup
 
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		rhl.Println("start web-srv")
-		StartControlWeb(*addr_s)
-		rhl.Println("web finished")
+		rhl.Println("start web-ctrl")
+		StartControlWeb(*addr_s, conf)
+		rhl.Println("web-ctrl finished")
 	}()
 
 	alldone := make(chan bool)