decoupled progBar from download task, label removed (first try)

Author: saniales

common/net_functions.go

@@ -36,8 +36,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-
-	pb "gopkg.in/cheggaaa/pb.v1"
+	"time"
 )
 
 // DownloadIndex is a function to download a generic index.
@@ -72,17 +71,13 @@ func DownloadIndex(indexPathFunc func() (string, error), URL string) error {
 }
 
 // DownloadPackage downloads a package from arduino repository, applying a label for the progress bar.
-func DownloadPackage(URL string, downloadLabel string, progressBar *pb.ProgressBar, initialData *os.File, totalSize int64) error {
-	client := http.DefaultClient
-
+func DownloadPackage(URL string, initialData *os.File, totalSize int64, handleResultFunc func(io.Reader, int) error) error {
 	if initialData == nil {
 		return errors.New("Cannot fill a nil file pointer")
 	}
 
-	request, err := http.NewRequest("GET", URL, nil)
-	if err != nil {
-		return fmt.Errorf("Cannot create HTTP request: %s", err)
-	}
+	client := http.DefaultClient
+	client.Timeout = time.Minute
 
 	var initialSize int64
 	stats, err := initialData.Stat()
@@ -97,31 +92,34 @@ func DownloadPackage(URL string, downloadLabel string, progressBar *pb.ProgressB
 		}
 	}
 
+	request, err := http.NewRequest("GET", URL, nil)
+	if err != nil {
+		return fmt.Errorf("Cannot create HTTP request: %s", err)
+	}
+
 	if initialSize > 0 {
 		request.Header.Add("Range", fmt.Sprintf("bytes=%d-", initialSize))
 	}
 
 	response, err := client.Do(request)
-
 	if err != nil {
-		return fmt.Errorf("Cannot fetch %s. Response creation error", downloadLabel)
+		return fmt.Errorf("Cannot fetch %s. Response creation error", URL)
 	} else if response.StatusCode != 200 &&
 		response.StatusCode != 206 &&
 		response.StatusCode != 416 {
 		response.Body.Close()
-		return fmt.Errorf("Cannot fetch %s. Source responded with a status %d code", downloadLabel, response.StatusCode)
+		return fmt.Errorf("Cannot fetch %s. Source responded with code %d",
+			URL, response.StatusCode)
 	}
 	defer response.Body.Close()
 
-	source := response.Body
-	if progressBar != nil {
-		progressBar.Add(int(initialSize))
-		source = progressBar.NewProxyReader(response.Body)
+	if handleResultFunc == nil {
+		_, err = io.Copy(initialData, response.Body)
+	} else {
+		err = handleResultFunc(response.Body, int(initialSize))
 	}
-
-	_, err = io.Copy(initialData, source)
 	if err != nil {
-		return fmt.Errorf("Cannot read response body %s", err)
+		return fmt.Errorf("Cannot read response body from %s : %s", URL, err)
 	}
 	return nil
 }

common/releases/helpers.go

@@ -32,6 +32,7 @@ package releases
 import (
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -84,25 +85,37 @@ func ParseArgs(args []string) []NameVersionPair {
 //     label -> Name used to identify the type of the Item downloaded (library, core, tool)
 //   RETURNS:
 //     error if any
-func downloadRelease(item DownloadItem, progBar *pb.ProgressBar, label string) error {
+func downloadRelease(item DownloadItem, progBar *pb.ProgressBar, label string) (io.Reader, error) {
 	if item.Release == nil {
-		return errors.New("Cannot accept nil release")
+		return nil, errors.New("Cannot accept nil release")
 	}
 
 	initialData, err := item.Release.OpenLocalArchiveForDownload()
 	if err != nil {
-		return fmt.Errorf("Cannot get Archive file of this release : %s", err)
+		return nil, fmt.Errorf("Cannot get Archive file of this release : %s", err)
 	}
 	defer initialData.Close()
-	err = common.DownloadPackage(item.Release.ArchiveURL(), fmt.Sprint(label, " ", item.Name), progBar, initialData, item.Release.ArchiveSize())
+	// puts the progress bar
+	err = common.DownloadPackage(item.Release.ArchiveURL(), initialData, item.Release.ArchiveSize(), func(source io.Reader, initialSize int) error {
+		if progBar != nil {
+			progBar.Add(int(initialSize))
+			source = progBar.NewProxyReader(source)
+		}
+
+		_, err = io.Copy(initialData, source)
+		if err != nil {
+			return fmt.Errorf("Cannot read response body %s", err)
+		}
+		return nil
+	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	err = checkLocalArchive(item.Release)
 	if err != nil {
-		return errors.New("Archive has been downloaded, but it seems corrupted. Try again to redownload it")
+		return nil, errors.New("Archive has been downloaded, but it seems corrupted. Try again to redownload it")
 	}
-	return nil
+	return reader, nil
 }
 
 // downloadAndCache returns the wrapper to download something without installing it

cores/cores.go

@@ -139,6 +139,8 @@ func (release Release) OpenLocalArchiveForDownload() (*os.File, error) {
 	stats, err := os.Stat(path)
 	if os.IsNotExist(err) || err == nil && stats.Size() >= release.Size {
 		return os.Create(path)
+	} else if err != nil {
+		return nil, err
 	}
 	return os.OpenFile(path, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
 }

cores/package_manager.go

@@ -31,10 +31,10 @@ package cores
 
 //Package represents a package in the system.
 type Package struct {
-	Name       string
-	Maintainer string
-	WebsiteURL string
-	Email      string
+	Name       string           // Name of the package.
+	Maintainer string           // Name of the maintainer.
+	WebsiteURL string           // Website of maintainer.
+	Email      string           // Email of maintainer.
 	Cores      map[string]*Core // The cores in the system.
 	Tools      map[string]*Tool // The tools in the system.
 }

libraries/index.go

@@ -43,8 +43,8 @@ type Index struct {
 
 // indexRelease is an entry of a library_index.json
 type indexRelease struct {
-	Name            string   `json:"name"`
-	Version         string   `json:"version"`
+	Name            string   `json:"name,required"`
+	Version         string   `json:"version,required"`
 	Author          string   `json:"author"`
 	Maintainer      string   `json:"maintainer"`
 	Sentence        string   `json:"sentence"`