vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-29 04:16:07 +00:00
Code Issues Projects Releases Wiki Activity

Refactor Downloader: it accepts channel, not generates it.

Browse Source
This commit is contained in:
Andrey Smirnov
2013-12-18 12:56:30 +04:00
parent 055c38a4d9
commit e738ac7ed8
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/download.go
+5 -8
View File
@@ -14,7 +14,7 @@ import (
// Downloader is parallel HTTP fetcher
type Downloader interface {
Download(url string, destination string) <-chan error
Download(url string, destination string, result chan<- error)
Shutdown()
}
@@ -68,12 +68,8 @@ func (downloader *downloaderImpl) Shutdown() {
}
// Download starts new download task
func (downloader *downloaderImpl) Download(url string, destination string) <-chan error {
ch := make(chan error, 1)
downloader.queue <- &downloadTask{url: url, destination: destination, result: ch}
return ch
func (downloader *downloaderImpl) Download(url string, destination string, result chan<- error) {
downloader.queue <- &downloadTask{url: url, destination: destination, result: result}
}
// handleTask processes single download task
@@ -149,7 +145,8 @@ func DownloadTemp(downloader Downloader, url string) (*os.File, error) {
tempfile := filepath.Join(tempdir, "buffer")
ch := downloader.Download(url, tempfile)
ch := make(chan error, 1)
downloader.Download(url, tempfile, ch)
err = <-ch
if err != nil {