major refactoring of base structure

3 files changed, 50 insertions, 13 deletions

diff --git a/src/helsinki.at/rhimport/conf.go b/src/helsinki.at/rhimport/conf.go
index 6dcbe84..8e373c0 100644
--- a/src/helsinki.at/rhimport/conf.go
+++ b/src/helsinki.at/rhimport/conf.go
@@ -45,6 +45,7 @@ type getPasswordRequest struct {
 type Config struct {
 	configfile        string
 	RDXportEndpoint   string
+	TempDir           string
 	db_host           string
 	db_user           string
 	db_passwd         string
@@ -142,7 +143,7 @@ func (self *Config) Cleanup() {
 	}
 }
 
-func NewConfig(configfile, rdxport_endpoint *string) (conf *Config, err error) {
+func NewConfig(configfile, rdxport_endpoint, temp_dir *string) (conf *Config, err error) {
 	conf = new(Config)
 	conf.configfile = *configfile
 	if err = conf.read_config_file(); err != nil {
@@ -151,6 +152,7 @@ func NewConfig(configfile, rdxport_endpoint *string) (conf *Config, err error) {
 	conf.quit = make(chan bool)
 	conf.done = make(chan bool)
 	conf.RDXportEndpoint = *rdxport_endpoint
+	conf.TempDir = *temp_dir
 	conf.password_cache = make(map[string]string)
 	conf.getPasswordChan = make(chan getPasswordRequest)
 
diff --git a/src/helsinki.at/rhimport/fetcher.go b/src/helsinki.at/rhimport/fetcher.go
new file mode 100644
index 0000000..ead9f5f
--- /dev/null
+++ b/src/helsinki.at/rhimport/fetcher.go
@@ -0,0 +1,34 @@
+//
+//  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
+
+func FetchFile(ctx *ImportContext) (err error) {
+
+	// TODO: fetch file from ctx.SourceUri and put it into ctx.Conf.TempDir
+
+	ctx.SourceFile = ctx.Conf.TempDir + "/source-file.ogg"
+	ctx.DeleteSourceFile = true
+	return
+}
diff --git a/src/helsinki.at/rhimport/importer.go b/src/helsinki.at/rhimport/importer.go
index e47bc05..95e3e73 100644
--- a/src/helsinki.at/rhimport/importer.go
+++ b/src/helsinki.at/rhimport/importer.go
@@ -25,12 +25,12 @@
 package rhimport
 
 import (
-	// "bytes"
-	// "fmt"
-	// "io"
-	// "mime/multipart"
-	// "net/http"
-	// "os"
+// "bytes"
+// "fmt"
+// "io"
+// "mime/multipart"
+// "net/http"
+// "os"
 )
 
 type ImportContext struct {
@@ -40,24 +40,27 @@ type ImportContext struct {
 	Trusted            bool
 	GroupName          string
 	Cart               int
+	Cut                int
 	Channels           int
 	NormalizationLevel int
 	AutotrimLevel      int
 	UseMetaData        bool
+	SourceUri          string
 	SourceFile         string
 	DeleteSourceFile   bool
 }
 
-func NewImportContext(conf *Config, user string, group string, cart int) *ImportContext {
+func NewImportContext(conf *Config, user string, group string) *ImportContext {
 	ctx := new(ImportContext)
 	ctx.Conf = conf
 	ctx.UserName = user
 	ctx.Password = ""
 	ctx.Trusted = false
 	ctx.GroupName = group
-	ctx.Cart = cart
+	ctx.Cart = 0
+	ctx.Cut = 0
 	ctx.Channels = 2
-	ctx.NormalizationLevel = 1200
+	ctx.NormalizationLevel = -1200
 	ctx.AutotrimLevel = 0
 	ctx.UseMetaData = false
 	ctx.SourceFile = ""
@@ -137,9 +140,7 @@ func ImportFile(ctx *ImportContext) (err error) {
 			return
 		}
 	}
-	rhdl.Printf("credentials: '%s':'%s'", ctx.UserName, ctx.Password)
-
-//	err = fmt.Errorf("%+v", ctx)
+	rhdl.Printf("%+v", ctx)
 
 	return
 }