diff options
| author | Christian Pointner <equinox@helsinki.at> | 2015-12-22 03:18:46 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2015-12-22 03:18:46 (GMT) |
| commit | e40235206363f09a43723fd7af10ef66bcfa08a3 (patch) | |
| tree | e00bd8861c3e460eaf64f98ade15d03006189c61 /src/helsinki.at/rhimport/fetcher.go | |
| parent | c0463be82447f269d9947d16a40881dbbe600827 (diff) | |
session based callbacks work now
Diffstat (limited to 'src/helsinki.at/rhimport/fetcher.go')
| -rw-r--r-- | src/helsinki.at/rhimport/fetcher.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/helsinki.at/rhimport/fetcher.go b/src/helsinki.at/rhimport/fetcher.go index 36d7055..acb6592 100644 --- a/src/helsinki.at/rhimport/fetcher.go +++ b/src/helsinki.at/rhimport/fetcher.go @@ -123,7 +123,9 @@ func FetchFileCurl(ctx *ImportContext, res *FetchResult, uri *url.URL) (err erro } if ctx.ProgressCallBack != nil { - ctx.ProgressCallBack(1, "downloading", dlnow/dltotal, ctx.ProgressCallBackData) + if keep := ctx.ProgressCallBack(1, "downloading", dlnow/dltotal, ctx.ProgressCallBackData); !keep { + ctx.ProgressCallBack = nil + } } return true }) @@ -156,7 +158,9 @@ func FetchFileCurl(ctx *ImportContext, res *FetchResult, uri *url.URL) (err erro func FetchFileLocal(ctx *ImportContext, res *FetchResult, uri *url.URL) (err error) { rhl.Printf("Local fetcher called for '%s'", ctx.SourceUri) if ctx.ProgressCallBack != nil { - ctx.ProgressCallBack(1, "fetching", 1.0, ctx.ProgressCallBackData) + if keep := ctx.ProgressCallBack(1, "fetching", 1.0, ctx.ProgressCallBackData); !keep { + ctx.ProgressCallBack = nil + } } ctx.SourceFile = filepath.Join(ctx.conf.LocalFetchDir, path.Clean("/"+uri.Path)) @@ -188,12 +192,16 @@ func FetchFileFake(ctx *ImportContext, res *FetchResult, uri *url.URL) error { return nil } if ctx.ProgressCallBack != nil { - ctx.ProgressCallBack(1, "faking", float64(i)/float64(duration), ctx.ProgressCallBackData) + if keep := ctx.ProgressCallBack(1, "faking", float64(i)/float64(duration), ctx.ProgressCallBackData); !keep { + ctx.ProgressCallBack = nil + } } time.Sleep(100 * time.Millisecond) } if ctx.ProgressCallBack != nil { - ctx.ProgressCallBack(1, "faking", 1.0, ctx.ProgressCallBackData) + if keep := ctx.ProgressCallBack(1, "faking", 1.0, ctx.ProgressCallBackData); !keep { + ctx.ProgressCallBack = nil + } } ctx.SourceFile = "/nonexistend/fake.mp3" ctx.DeleteSourceFile = false |