diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-07-15 19:08:31 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-07-15 19:08:31 (GMT) |
commit | 07b1b44dd3919691c4dcdfc2f0da552912a4b51e (patch) | |
tree | b2b388fe29f783b1b32676a9dd5ca0ff236f9700 /rhimport/fetcher.go | |
parent | 49a33ef6dcfccda67c9afc54d4dc061a74dfbb6d (diff) |
improved sanity checking before fetch/import starts
fix bug which lead to double normalization
Diffstat (limited to 'rhimport/fetcher.go')
-rw-r--r-- | rhimport/fetcher.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index 45434a6..9170a86 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -83,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.FetchConverter, data.filename, data.metadata, data.ctx.Channels) + conv, newFilename, err := NewFetchConverter(data.ctx, data.filename, data.metadata) if err != nil { rhl.Printf("Unable to create converter for file %s: %s", data.filename, err) data.writeError = err @@ -210,7 +210,10 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) { } } - if info.Extractor != "generic" && info.Extractor != "dropbox" { + switch strings.ToLower(info.Extractor) { + case "generic": + case "dropbox": + default: ctx.Title = info.ExtractorKey + ": " + info.Title if info.Title == "" { ctx.Title += info.ID @@ -425,7 +428,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.FetchConverter, filepath.Join(basepath, origFile), nil, ctx.Channels); err != nil { + if conv, ctx.SourceFile, err = NewFetchConverter(ctx, filepath.Join(basepath, origFile), nil); err != nil { rhl.Printf("Unable to create converter for file %s: %s", origDir+origFile, err) return } @@ -645,7 +648,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.FetchConverter, ctx.SourceFile, nil, ctx.Channels); err != nil { + if conv, ctx.SourceFile, err = NewFetchConverter(ctx, ctx.SourceFile, nil); err != nil { rhl.Printf("Unable to create converter for file %s: %s", ctx.OrigFilename, err) return err } |