From 090f1621563a2b5069dd54ba7e67b7c07cc79f13 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Mon, 14 Dec 2015 15:48:37 +0100
Subject: fixed bug where some context values where not initialiized properly


diff --git a/conf.go b/conf.go
index 7288a89..2386ba9 100644
--- a/conf.go
+++ b/conf.go
@@ -28,6 +28,13 @@ import (
 	"github.com/vaughan0/go-ini"
 )
 
+type ImportParamDefaults struct {
+	Channels           uint
+	NormalizationLevel int
+	AutotrimLevel      int
+	UseMetaData        bool
+}
+
 type Config struct {
 	configfile      string
 	RDXportEndpoint string
@@ -36,6 +43,7 @@ type Config struct {
 	db_user         string
 	db_passwd       string
 	db_db           string
+	ImportParamDefaults
 }
 
 func get_ini_value(file ini.File, section string, key string, dflt string) string {
@@ -67,5 +75,9 @@ func NewConfig(configfile, rdxport_endpoint, temp_dir *string) (conf *Config, er
 	}
 	conf.RDXportEndpoint = *rdxport_endpoint
 	conf.TempDir = *temp_dir
+	conf.ImportParamDefaults.Channels = 2
+	conf.ImportParamDefaults.NormalizationLevel = -12
+	conf.ImportParamDefaults.AutotrimLevel = 0
+	conf.ImportParamDefaults.UseMetaData = true
 	return
 }
diff --git a/importer.go b/importer.go
index 925722e..aa5343d 100644
--- a/importer.go
+++ b/importer.go
@@ -74,10 +74,10 @@ func NewImportContext(conf *Config, rddb *RdDb, user string) *ImportContext {
 	ctx.GroupName = ""
 	ctx.Cart = 0
 	ctx.Cut = 0
-	ctx.Channels = 2
-	ctx.NormalizationLevel = -12
-	ctx.AutotrimLevel = 0
-	ctx.UseMetaData = false
+	ctx.Channels = conf.ImportParamDefaults.Channels
+	ctx.NormalizationLevel = conf.ImportParamDefaults.NormalizationLevel
+	ctx.AutotrimLevel = conf.ImportParamDefaults.AutotrimLevel
+	ctx.UseMetaData = conf.ImportParamDefaults.UseMetaData
 	ctx.SourceFile = ""
 	ctx.DeleteSourceFile = false
 	ctx.DeleteSourceDir = false
@@ -158,6 +158,7 @@ func (ctx *ImportContext) getShowInfo() (carts []uint, err error) {
 	ctx.GroupName = res.group
 	ctx.NormalizationLevel = res.norm_lvl
 	ctx.AutotrimLevel = res.trim_lvl
+	ctx.Channels = 2
 	ctx.UseMetaData = true
 	carts = res.carts
 	return
@@ -188,6 +189,7 @@ func (ctx *ImportContext) getMusicInfo() (err error) {
 	}
 	ctx.NormalizationLevel = res.norm_lvl
 	ctx.AutotrimLevel = res.trim_lvl
+	ctx.Channels = 2
 	ctx.UseMetaData = true
 	return
 }
diff --git a/rddb.go b/rddb.go
index b693c47..8b72f58 100644
--- a/rddb.go
+++ b/rddb.go
@@ -251,7 +251,7 @@ func (self *RdDb) getMusicInfo(group string) (result getMusicInfoResult) {
 	result.err = self.checkMusicGroupStmt.QueryRow(group).Scan(&result.norm_lvl, &result.trim_lvl)
 	if result.err != nil {
 		if result.err == sql.ErrNoRows {
-			result.err = fmt.Errorf("music pool '%d' not found", group)
+			result.err = fmt.Errorf("music pool '%s' not found", group)
 		}
 		return
 	}
-- 
cgit v0.10.2