added resumable download, untested

Author: saniales

common/functions.go

@@ -31,6 +31,7 @@ package common
 
 import (
 	"archive/zip"
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -154,14 +155,25 @@ func TruncateDir(dir 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) ([]byte, error) {
+func DownloadPackage(URL string, downloadLabel string, progressBar *pb.ProgressBar, initialData []byte) ([]byte, error) {
 	client := http.DefaultClient
 
 	request, err := http.NewRequest("GET", URL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot create HTTP request: %s", err)
 	}
 
+	var initialSize int
+	if initialData == nil {
+		initialSize = 0
+	} else {
+		initialSize = len(initialData)
+	}
+
+	if initialSize > 0 {
+		request.Header.Add("Range", fmt.Sprintf("bytes=%d-", initialSize))
+	}
+	//TODO : how to add progressbar with resume download?
 	response, err := client.Do(request)
 
 	if err != nil {
@@ -174,12 +186,20 @@ func DownloadPackage(URL string, downloadLabel string, progressBar *pb.ProgressB
 
 	source := response.Body
 	if progressBar != nil {
+		progressBar.Add(initialSize)
 		source = progressBar.NewProxyReader(response.Body)
 	}
 
 	body, err := ioutil.ReadAll(source)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot read response body")
 	}
-	return body, nil
+	var total []byte
+	if initialData != nil {
+		total = bytes.Join([][]byte{initialData, body}, nil)
+	} else {
+		total = body
+	}
+
+	return total, nil
 }

cores/cores.go

@@ -75,8 +75,7 @@ func (core *Core) Versions() semver.Versions {
 
 // Latest obtains latest version of a core package.
 func (core *Core) Latest() *Release {
-	latest := core.latestVersion()
-	return core.GetVersion(latest)
+	return core.GetVersion(core.latestVersion())
 }
 
 // latestVersion obtains latest version number.

cores/package_manager.go

@@ -53,6 +53,15 @@ func (pm *Package) AddCore(indexCore *indexCoreRelease) {
 	}
 }
 
+// Items returns the list of cores of this package.
+func (pm Package) Items() map[string]interface{} {
+	ret := make(map[string]interface{}, len(pm.Cores))
+	for key, val := range pm.Cores {
+		ret[key] = val
+	}
+	return ret
+}
+
 // Names returns an array with all the names of the registered cores.
 func (pm Package) Names() []string {
 	res := make([]string, len(pm.Cores))

cores/status.go

@@ -46,15 +46,6 @@ func (sc *StatusContext) AddPackage(indexPackage *indexPackage) {
 	sc.Packages[indexPackage.Name] = indexPackage.extractPackage()
 }
 
-// Items returns a map matching core name and core struct.
-func (pm Package) Items() map[string]interface{} {
-	ret := make(map[string]interface{}, len(pm.Cores))
-	for key, val := range pm.Cores {
-		ret[key] = val
-	}
-	return ret
-}
-
 // Names returns the array containing the name of the packages.
 func (sc StatusContext) Names() []string {
 	res := make([]string, len(sc.Packages))

cores/tools.go

@@ -0,0 +1,5 @@
+package cores
+
+type Tool struct {
+	
+}

libraries/download.go

@@ -85,7 +85,8 @@ func downloadRelease(library *Library, progBar *pb.ProgressBar, version string)
 	if release == nil {
 		return nil, errors.New("Invalid version number")
 	}
-	return common.DownloadPackage(release.URL, fmt.Sprintf("library %s", library.Name), progBar)
+	initialData := release.ReadLocalArchive()
+	return common.DownloadPackage(release.URL, fmt.Sprintf("library %s", library.Name), progBar, initialData)
 }
 
 // DownloadLibrariesFile downloads the lib file from arduino repository.

libraries/libraries.go

@@ -128,6 +128,23 @@ type Release struct {
 	Checksum        string `json:"checksum"`
 }
 
+// ReadLocalArchive reads the data from the local archive if present,
+// and returns the []byte of the file content. Used by resume Download.
+func (r Release) ReadLocalArchive() []byte {
+	staging, err := getDownloadCacheFolder()
+	if err != nil {
+		return nil
+	}
+	path := filepath.Join(staging, r.ArchiveFileName)
+	content, err := ioutil.ReadFile(path)
+	// if the size is the same the archive has been downloaded and if we force redownload
+	// it won't work.
+	if err != nil || len(content) == r.Size {
+		return nil
+	}
+	return content
+}
+
 /*
 
 type releaseAlias Release