Add URL to all download errrors, so that they're easier to understand. #26

This commit is contained in:
Andrey Smirnov
2014-10-02 14:12:43 +04:00
parent 40509f73b3
commit 91c753ad2f
+5 -5
View File
@@ -124,7 +124,7 @@ func (downloader *downloaderImpl) handleTask(task *downloadTask) {
resp, err := downloader.client.Get(task.url) resp, err := downloader.client.Get(task.url)
if err != nil { if err != nil {
task.result <- err task.result <- fmt.Errorf("%s: %s", task.url, err)
return return
} }
if resp.Body != nil { if resp.Body != nil {
@@ -138,7 +138,7 @@ func (downloader *downloaderImpl) handleTask(task *downloadTask) {
err = os.MkdirAll(filepath.Dir(task.destination), 0755) err = os.MkdirAll(filepath.Dir(task.destination), 0755)
if err != nil { if err != nil {
task.result <- err task.result <- fmt.Errorf("%s: %s", task.url, err)
return return
} }
@@ -146,7 +146,7 @@ func (downloader *downloaderImpl) handleTask(task *downloadTask) {
outfile, err := os.Create(temppath) outfile, err := os.Create(temppath)
if err != nil { if err != nil {
task.result <- err task.result <- fmt.Errorf("%s: %s", task.url, err)
return return
} }
defer outfile.Close() defer outfile.Close()
@@ -163,7 +163,7 @@ func (downloader *downloaderImpl) handleTask(task *downloadTask) {
_, err = io.Copy(w, resp.Body) _, err = io.Copy(w, resp.Body)
if err != nil { if err != nil {
os.Remove(temppath) os.Remove(temppath)
task.result <- err task.result <- fmt.Errorf("%s: %s", task.url, err)
return return
} }
@@ -194,7 +194,7 @@ func (downloader *downloaderImpl) handleTask(task *downloadTask) {
err = os.Rename(temppath, task.destination) err = os.Rename(temppath, task.destination)
if err != nil { if err != nil {
os.Remove(temppath) os.Remove(temppath)
task.result <- err task.result <- fmt.Errorf("%s: %s", task.url, err)
return return
} }