Merge lp:~sergiusens/snappy/splitDown into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Split package download logic and its generic bits

[John Lenton (chipaca)]

review: Approve

[John Lenton (chipaca)]

(oops, top apptoved by mistake -- but no harm done if it lands)

[lp:~sergiusens/snappy/splitDown]

526. By Sergio Schvezov on 2015-06-30

Better download code error reporting

527. By Sergio Schvezov on 2015-06-30

Merging trunk

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-06-29 23:16:31 +0000
+++ snappy/errors.go	2015-06-30 12:31:47 +0000
@@ -22,6 +22,7 @@
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"strings"
 
 	"launchpad.net/snappy/helpers"
@@ -144,6 +145,16 @@
 	ErrNoSeccompPolicy = errors.New("no seccomp policy provided")
 )
 
+// ErrDownload represents a download error
+type ErrDownload struct {
+	code int
+	url  *url.URL
+}
+
+func (e *ErrDownload) Error() string {
+	return fmt.Sprintf("received an unexpected http response code (%v) when trying to download %s", e.code, e.url)
+}
+
 // ErrArchitectureNotSupported is returned when trying to install a snappy package that
 // is not supported on the system
 type ErrArchitectureNotSupported struct {

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-12 03:55:01 +0000
+++ snappy/snapp.go	2015-06-30 12:31:47 +0000
@@ -1432,9 +1432,34 @@
 	return p
 }
 
+// download writes an http.Request showing a progress.Meter
+func download(name string, w io.Writer, req *http.Request, pbar progress.Meter) error {
+	client := &http.Client{}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return &ErrDownload{code: resp.StatusCode, url: req.URL}
+	}
+
+	if pbar != nil {
+		pbar.Start(name, float64(resp.ContentLength))
+		mw := io.MultiWriter(w, pbar)
+		_, err = io.Copy(mw, resp.Body)
+		pbar.Finished()
+	} else {
+		_, err = io.Copy(w, resp.Body)
+	}
+
+	return err
+}
+
 // Download downloads the snap and returns the filename
 func (s *RemoteSnapPart) Download(pbar progress.Meter) (string, error) {
-
 	w, err := ioutil.TempFile("", s.pkg.Name)
 	if err != nil {
 		return "", err
@@ -1456,26 +1481,7 @@
 	}
 	setUbuntuStoreHeaders(req)
 
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return "", fmt.Errorf("Unexpected status code %v", resp.StatusCode)
-	}
-
-	if pbar != nil {
-		pbar.Start(s.pkg.Name, float64(resp.ContentLength))
-		mw := io.MultiWriter(w, pbar)
-		_, err = io.Copy(mw, resp.Body)
-		pbar.Finished()
-	} else {
-		_, err = io.Copy(w, resp.Body)
-	}
-
-	if err != nil {
+	if err := download(s.Name(), w, req, pbar); err != nil {
 		return "", err
 	}