diff options
Diffstat (limited to 'rhimport/fetcher.go')
| -rw-r--r-- | rhimport/fetcher.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index 670553f..f40adca 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -80,6 +80,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) if err != nil { rhl.Printf("Unable to create converter for file %s: %s", data.filename, err) @@ -354,6 +355,7 @@ func fetchFileDirConvert(ctx *Context, res *Result, origSrc *os.File, sizeTotal } origDir, origFile := path.Split(ctx.SourceFile) + ctx.OrigFilename = ctx.SourceFile var conv FetchConverter if conv, ctx.SourceFile, err = NewFetchConverter(ctx.FetchConverter, filepath.Join(basepath, origFile), nil); err != nil { rhl.Printf("Unable to create converter for file %s: %s", origDir+origFile, err) @@ -507,6 +509,7 @@ func fetchFileFake(ctx *Context, res *Result, uri *url.URL) error { } } ctx.SourceFile = "/nonexistend/fake.mp3" + ctx.OrigFilename = ctx.SourceFile if ctx.SourceFilePolicy == Auto { ctx.DeleteSourceFile = false ctx.DeleteSourceDir = false @@ -589,12 +592,11 @@ func fetchFileAttachment(ctx *Context, res *Result, uri *url.URL) error { ctx.SourceFile = filepath.Join(basepath, path.Clean("/"+uri.Path)) var conv FetchConverter - var newFilename string - if conv, newFilename, err = NewFetchConverter(ctx.FetchConverter, ctx.SourceFile, nil); err != nil { - rhl.Printf("Unable to create converter for file %s: %s", ctx.SourceFile, err) + ctx.OrigFilename = ctx.SourceFile + if conv, ctx.SourceFile, err = NewFetchConverter(ctx.FetchConverter, ctx.SourceFile, nil); err != nil { + rhl.Printf("Unable to create converter for file %s: %s", ctx.OrigFilename, err) return err } - ctx.SourceFile = newFilename if ctx.ProgressCallBack != nil { if keep := ctx.ProgressCallBack(1, "receiving", 0.0, float64(sizeTotal), ctx.ProgressCallBackData); !keep { |