Refactored some lib functions, no code change

Author: cmaglie

commands/lib/download.go

@@ -61,22 +61,25 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
 
 	logrus.Info("Preparing download")
 	pairs := librariesindex.ParseArgs(args)
-	downloadLibraries(lm, pairs)
+	downloadLibrariesFromReferences(lm, pairs)
 }
 
-func downloadLibraries(lm *librariesmanager.LibrariesManager, refs []*librariesindex.Reference) {
-	libsReleaseToDownload := []*librariesindex.Release{}
+func downloadLibrariesFromReferences(lm *librariesmanager.LibrariesManager, refs []*librariesindex.Reference) {
+	libReleases := []*librariesindex.Release{}
 	for _, ref := range refs {
 		if lib := lm.Index.FindRelease(ref); lib == nil {
 			formatter.PrintErrorMessage("Error: library " + ref.String() + " not found")
 			os.Exit(commands.ErrBadCall)
 		} else {
-			libsReleaseToDownload = append(libsReleaseToDownload, lib)
+			libReleases = append(libReleases, lib)
 		}
 	}
+	downloadLibraries(lm, libReleases)
+}
 
+func downloadLibraries(lm *librariesmanager.LibrariesManager, libReleases []*librariesindex.Release) {
 	logrus.Info("Downloading libraries")
-	for _, libRelease := range libsReleaseToDownload {
+	for _, libRelease := range libReleases {
 		resp, err := libRelease.Resource.Download(lm.DownloadsDir)
 		if err != nil {
 			formatter.PrintError(err, "Error downloading "+libRelease.String())

commands/lib/install.go

@@ -59,22 +59,25 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 	lm := commands.InitLibraryManager(nil)
 
 	refs := librariesindex.ParseArgs(args)
-	downloadLibraries(lm, refs)
-	installLibraries(lm, refs)
+	downloadLibrariesFromReferences(lm, refs)
+	installLibrariesFromReferences(lm, refs)
 }
 
-func installLibraries(lm *librariesmanager.LibrariesManager, refs []*librariesindex.Reference) {
-	libReleasesToInstall := []*librariesindex.Release{}
+func installLibrariesFromReferences(lm *librariesmanager.LibrariesManager, refs []*librariesindex.Reference) {
+	libReleases := []*librariesindex.Release{}
 	for _, ref := range refs {
 		rel := lm.Index.FindRelease(ref)
 		if rel == nil {
 			formatter.PrintErrorMessage("Error: library " + ref.String() + " not found")
 			os.Exit(commands.ErrBadCall)
 		}
-		libReleasesToInstall = append(libReleasesToInstall, rel)
+		libReleases = append(libReleases, rel)
 	}
+	installLibraries(lm, libReleases)
+}
 
-	for _, libRelease := range libReleasesToInstall {
+func installLibraries(lm *librariesmanager.LibrariesManager, libReleases []*librariesindex.Release) {
+	for _, libRelease := range libReleases {
 		logrus.WithField("library", libRelease).Info("Installing library")
 
 		if _, err := lm.Install(libRelease); err != nil {

commands/lib/list.go

@@ -32,6 +32,7 @@ package lib
 import (
 	"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
 	"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesindex"
+	"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/bcmi-labs/arduino-cli/commands"
 	"github.com/bcmi-labs/arduino-cli/common/formatter"
 	"github.com/bcmi-labs/arduino-cli/common/formatter/output"
@@ -62,17 +63,26 @@ var listFlags struct {
 }
 
 func runListCommand(cmd *cobra.Command, args []string) {
+	logrus.Info("Listing")
 	var pm *packagemanager.PackageManager
 	if listFlags.all {
 		pm = commands.InitPackageManager()
 	}
 	lm := commands.InitLibraryManager(pm)
 
-	res := output.InstalledLibraries{}
+	res := listLibraries(lm, listFlags.updatable)
+	if len(res.Libraries) > 0 {
+		formatter.Print(res)
+	}
+	logrus.Info("Done")
+}
+
+func listLibraries(lm *librariesmanager.LibrariesManager, updatable bool) *output.InstalledLibraries {
+	res := &output.InstalledLibraries{}
 	for _, libAlternatives := range lm.Libraries {
 		for _, lib := range libAlternatives.Alternatives {
 			var available *librariesindex.Release
-			if listFlags.updatable {
+			if updatable {
 				available = lm.Index.FindLibraryUpdate(lib)
 				if available == nil {
 					continue
@@ -84,10 +94,5 @@ func runListCommand(cmd *cobra.Command, args []string) {
 			})
 		}
 	}
-	logrus.Info("Listing")
-
-	if len(res.Libraries) > 0 {
-		formatter.Print(res)
-	}
-	logrus.Info("Done")
+	return res
 }