added ExtraMetaData to context for converters who support this

1 files changed, 8 insertions, 11 deletions

diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go
index f8bfa0a..2b17951 100644
--- a/rhimport/fetcher.go
+++ b/rhimport/fetcher.go
@@ -51,7 +51,6 @@ type fetcherCurlCBData struct {
 	basepath   string
 	filename   string
 	remotename string
-	metadata   map[string]string
 	conv       fetchConverter
 	totalSize  float64
 	written    uint64
@@ -84,7 +83,7 @@ func curlWriteCallback(ptr []byte, userdata interface{}) bool {
 			data.filename = filepath.Join(data.basepath, name)
 		}
 		data.ctx.OrigFilename = data.filename
-		conv, newFilename, err := newFetchConverter(data.ctx, data.filename, data.metadata)
+		conv, newFilename, err := newFetchConverter(data.ctx, data.filename)
 		if err != nil {
 			data.ctx.stdlog.Printf("Unable to create converter for file %s: %s", data.filename, err)
 			data.writeError = err
@@ -223,8 +222,7 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) {
 			if info.Title == "" {
 				ctx.Title += info.ID
 			}
-			cbdata.metadata = make(map[string]string)
-			cbdata.metadata["TITLE"] = ctx.Title
+			ctx.ExtraMetaData["TITLE"] = ctx.Title
 		}
 	}
 
@@ -369,11 +367,10 @@ func fetchFileArchiv(ctx *Context, res *Result, uri *url.URL) (err error) {
 	easy.Setopt(curl.OPT_BUFFERSIZE, 1024*1024)
 
 	ctx.Title = fmt.Sprintf("Archiv vom %s - %s Uhr", start.Format("2.1.2006 15:04"), end.Format("15:04"))
-	cbdata.metadata = make(map[string]string)
-	cbdata.metadata["TITLE"] = ctx.Title
-	cbdata.metadata["ALBUM"] = "Radio Helsinki Archiv"
-	cbdata.metadata["ORGANIZATION"] = "Radio Helsinki"
-	cbdata.metadata["DATE"] = start.Format("2.1.2006")
+	ctx.ExtraMetaData["TITLE"] = ctx.Title
+	ctx.ExtraMetaData["ALBUM"] = "Radio Helsinki Archiv"
+	ctx.ExtraMetaData["ORGANIZATION"] = "Radio Helsinki"
+	ctx.ExtraMetaData["DATE"] = start.Format("2.1.2006")
 
 	ctx.dbglog.Printf("importing archiv file from %s", scpuri)
 	err = easy.Perform()
@@ -434,7 +431,7 @@ func fetchFileDirConvert(ctx *Context, res *Result, origSrc *os.File, sizeTotal
 
 	ctx.OrigFilename = ctx.SourceFile
 	var conv fetchConverter
-	if conv, ctx.SourceFile, err = newFetchConverter(ctx, filepath.Join(basepath, origFile), nil); err != nil {
+	if conv, ctx.SourceFile, err = newFetchConverter(ctx, filepath.Join(basepath, origFile)); err != nil {
 		ctx.stdlog.Printf("Unable to create converter for file %s: %s", origDir+origFile, err)
 		return
 	}
@@ -674,7 +671,7 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error {
 
 	var conv fetchConverter
 	ctx.OrigFilename = ctx.SourceFile
-	if conv, ctx.SourceFile, err = newFetchConverter(ctx, ctx.SourceFile, nil); err != nil {
+	if conv, ctx.SourceFile, err = newFetchConverter(ctx, ctx.SourceFile); err != nil {
 		ctx.stdlog.Printf("Unable to create converter for file %s: %s", ctx.OrigFilename, err)
 		return err
 	}