refactoring

Author: saniales

cmd/arduino_lib.go

@@ -220,9 +220,10 @@ func executeInstallCommand(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	libs, failed := purgeInvalidItems(releases.ParseArgs(args), status)
+	parsedArgs := releases.ParseArgs(args)
+	libs, failOutputs := purgeInvalidItems(parsedArgs, status)
 	outputResults := output.LibProcessResults{
-		Libraries: failed,
+		Libraries: failOutputs,
 	}
 	releases.ParallelDownloads(libs, false, "Installed", GlobalFlags.Verbose, &outputResults.Libraries)
 

common/releases/helpers.go

@@ -135,14 +135,16 @@ func ParallelDownloads(items []DownloadItem, forced bool, OkStatus string, verbo
 	progressBars := make([]*pb.ProgressBar, 0, itemC)
 	textMode := formatter.IsCurrentFormat("text")
 	for _, item := range items {
-		if forced || item.Release != nil && (!IsCached(item.Release) || item.Release.CheckLocalArchive() != nil) {
+		cached := IsCached(item.Release)
+		releaseNotNil := item.Release != nil
+		if forced || releaseNotNil && (!cached || item.Release.CheckLocalArchive() != nil) {
 			var pBar *pb.ProgressBar
 			if textMode {
 				pBar = pb.StartNew(int(item.Release.ArchiveSize())).SetUnits(pb.U_BYTES).Prefix(fmt.Sprintf("%-20s", item.Name))
 				progressBars = append(progressBars, pBar)
 			}
 			tasks[item.Name] = downloadAndCache(item, pBar)
-		} else if !forced && item.Release != nil && IsCached(item.Release) {
+		} else if !forced && releaseNotNil && cached {
 			//Consider OK
 			*refResults = append(*refResults, output.ProcessResult{
 				ItemName: item.Name,

cores/download.go

@@ -34,8 +34,8 @@ import (
 )
 
 const (
-	//PackageIndexURL contains the index URL for core packages.
-	PackageIndexURL = "http://downloads.arduino.cc/packages/package_index.json"
+	//packageIndexURL contains the index URL for core packages.
+	packageIndexURL = "http://downloads.arduino.cc/packages/package_index.json"
 )
 
 // getDownloadCacheFolder gets the folder where temp installs are stored until installation complete (libraries).
@@ -45,7 +45,7 @@ func getDownloadCacheFolder() (string, error) {
 
 // DownloadPackagesFile downloads the core packages index file from arduino repository.
 func DownloadPackagesFile() error {
-	return common.DownloadPackageIndex(IndexPath, PackageIndexURL)
+	return common.DownloadPackageIndex(IndexPath, packageIndexURL)
 }
 
 // download core

libraries/download.go

@@ -34,13 +34,13 @@ import (
 )
 
 const (
-	// LibraryIndexURL is the URL where to get library index.
-	LibraryIndexURL string = "http://downloads.arduino.cc/libraries/library_index.json"
+	// libraryIndexURL is the URL where to get library index.
+	libraryIndexURL string = "http://downloads.arduino.cc/libraries/library_index.json"
 )
 
 // DownloadLibrariesFile downloads the lib file from arduino repository.
 func DownloadLibrariesFile() error {
-	return common.DownloadPackageIndex(IndexPath, LibraryIndexURL)
+	return common.DownloadPackageIndex(IndexPath, libraryIndexURL)
 }
 
 // getDownloadCacheFolder gets the folder where temp installs are stored