formatting ongoing, completed on install and download commands

Author: saniales

cmd/arduino.go

@@ -35,7 +35,6 @@ import (
 
 	"github.com/bcmi-labs/arduino-cli/cmd/formatter"
 	homedir "github.com/mitchellh/go-homedir"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -119,7 +118,6 @@ func init() {
 }
 
 func arduinoPreRun(cmd *cobra.Command, args []string) {
-	fmt.Println(GlobalFlags)
 	if !formatter.IsSupported(GlobalFlags.Format) {
 		GlobalFlags.Format = "text"
 	}
@@ -143,11 +141,11 @@ func initConfig() {
 		// Find home directory.
 		home, err := homedir.Dir()
 		if err != nil {
-			logrus.Warn("Error while searching for home directory for this user")
+			base := "Error while searching for home directory for this user"
 			if GlobalFlags.Verbose > 0 {
-				logrus.Warnf(": %s\n", err.Error())
+				base += fmt.Sprintf(": %s\n", err)
 			}
-			logrus.Warnln()
+			formatter.Print(base)
 			os.Exit(1)
 		}
 
@@ -160,6 +158,6 @@ func initConfig() {
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
-		logrus.Infoln("Using config file:", viper.ConfigFileUsed())
+		formatter.Print(fmt.Sprintln("Using config file:", viper.ConfigFileUsed()))
 	}
 }

cmd/arduino_lib.go

@@ -40,6 +40,7 @@ import (
 
 	"github.com/bcmi-labs/arduino-cli/cmd/formatter"
 	"github.com/bcmi-labs/arduino-cli/cmd/pretty_print"
+	"github.com/bcmi-labs/arduino-cli/cmd/structs"
 	"github.com/bcmi-labs/arduino-cli/common"
 	"github.com/bcmi-labs/arduino-cli/libraries"
 	"github.com/bcmi-labs/arduino-cli/task"
@@ -118,42 +119,6 @@ var arduinoLibVersionCmd = &cobra.Command{
 	},
 }
 
-//DownloadResult contains info about a completed Download process.
-type DownloadResult struct {
-	Downloaded []string          `json:"downloaded"`
-	Errors     map[string]string `json:"errors"`
-}
-
-func (dr DownloadResult) String() string {
-	ret := ""
-	for _, name := range dr.Downloaded {
-		ret += fmt.Sprintf("%s - Downloaded\n", name)
-	}
-	ret += "Errors:\n"
-	for libName, err := range dr.Errors {
-		ret += fmt.Sprintf("%s - %s\n", libName, err)
-	}
-	return ret
-}
-
-//InstallResult contains info about a completed installation process.
-type InstallResult struct {
-	Installed []string          `json:"installed"`
-	Errors    map[string]string `json:"errors"`
-}
-
-func (dr InstallResult) String() string {
-	ret := ""
-	for _, name := range dr.Installed {
-		ret += fmt.Sprintf("%s - Installed\n", name)
-	}
-	ret += "Errors:\n"
-	for libName, err := range dr.Errors {
-		ret += fmt.Sprintf("%s - %s\n", libName, err)
-	}
-	return ret
-}
-
 func init() {
 	arduinoCmd.AddCommand(arduinoLibCmd)
 	arduinoLibCmd.AddCommand(arduinoLibInstallCmd)
@@ -195,20 +160,12 @@ func executeDownloadCommand(cmd *cobra.Command, args []string) error {
 
 	items, failed := extractValidLibraries(args, status)
 
-	libraryOK, libraryFails := parallelLibDownloads(items, len(args), true)
+	libraryResults := parallelLibDownloads(items, true)
 	for _, fail := range failed {
-		libraryFails[fail] = "Not Found"
+		libraryResults[fail] = "Error : Not Found"
 	}
 
-	if GlobalFlags.Verbose > 0 {
-		prettyPrints.DownloadLib(libraryOK, libraryFails)
-	} else {
-		formatter.Print(DownloadResult{
-			Downloaded: libraryOK,
-			Errors:     libraryFails,
-		})
-
-	}
+	formatter.Print(structs.LibResultsFromMap(libraryResults))
 
 	return nil
 }
@@ -230,10 +187,9 @@ func extractValidLibraries(args []string, status *libraries.StatusContext) ([]*l
 }
 
 // parallelLibDownloads executes multiple libraries downloads in parallel
-func parallelLibDownloads(items []*libraries.Library, argC int, forced bool) ([]string, map[string]string) {
+func parallelLibDownloads(items []*libraries.Library, forced bool) map[string]string {
 	itemC := len(items)
-	libraryOK := make([]string, 0, itemC)
-	libraryFails := make(map[string]string, argC-itemC)
+	libraryResults := make(map[string]string, itemC)
 
 	tasks := make(map[string]task.Wrapper, len(items))
 	progressBars := make([]*pb.ProgressBar, 0, len(items))
@@ -264,14 +220,14 @@ func parallelLibDownloads(items []*libraries.Library, argC int, forced bool) ([]
 
 		for libraryName, result := range results {
 			if result.Error != nil {
-				libraryFails[libraryName] = result.Error.Error()
+				libraryResults[libraryName] = fmt.Sprintf("Error : %s", result.Error)
 			} else {
-				libraryOK = append(libraryOK, libraryName)
+				libraryResults[libraryName] = "OK"
 			}
 		}
 	}
 
-	return libraryOK, libraryFails
+	return libraryResults
 }
 
 func executeInstallCommand(cmd *cobra.Command, args []string) error {
@@ -297,35 +253,22 @@ func executeInstallCommand(cmd *cobra.Command, args []string) error {
 	}
 
 	items, fails := extractValidLibraries(args, status)
-	libraryOK := make([]string, 0, len(items))
 
-	_, libraryFails := parallelLibDownloads(items, len(args), false)
+	libraryResults := parallelLibDownloads(items, false)
 	for _, fail := range fails {
-		libraryFails[fail] = "Not Found"
+		libraryResults[fail] = "Not Found"
 	}
 
 	for _, library := range items {
 		err = libraries.InstallLib(library, library.Latest().Version)
 		if err != nil {
-			libraryFails[library.Name] = err.Error()
+			libraryResults[library.Name] = fmt.Sprintf("Error : %s", err)
 		} else {
-			libraryOK = append(libraryOK, library.Name)
+			libraryResults[library.Name] = "OK"
 		}
 	}
 
-	if GlobalFlags.Verbose > 0 {
-		prettyPrints.InstallLib(libraryOK, libraryFails)
-	} else {
-		okEnd := len(libraryOK)
-		for i, library := range libraryOK {
-			logrus.Infof("%-10s - Installed (%d/%d)\n", library, i+1, okEnd)
-		}
-		i := okEnd
-		for library, failure := range libraryFails {
-			i++
-			logrus.Infof("%-10s - Error : %-10s (%d/%d)\n", library, failure, i, len(libraryFails))
-		}
-	}
+	formatter.Print(structs.LibResultsFromMap(libraryResults))
 
 	return nil
 }

cmd/structs/helpers.go

@@ -0,0 +1,17 @@
+package structs
+
+// LibResultsFromMap returns a LibProcessResults struct from a specified map of results.
+func LibResultsFromMap(resMap map[string]string) LibProcessResults {
+	results := LibProcessResults{
+		Libraries: make([]libProcessResult, len(resMap)),
+	}
+	i := 0
+	for libName, libResult := range resMap {
+		results.Libraries[i] = libProcessResult{
+			LibraryName: libName,
+			Result:      libResult,
+		}
+		i++
+	}
+	return results
+}

cmd/structs/structs.go

@@ -0,0 +1,31 @@
+package structs
+
+import (
+	"fmt"
+	"strings"
+)
+
+//LibProcessResults represent the result of a process on libraries.
+type LibProcessResults struct {
+	Libraries []libProcessResult `json:"libraries"`
+}
+
+// String returns a string representation of the object.
+func (lpr LibProcessResults) String() string {
+	ret := ""
+	for _, lr := range lpr.Libraries {
+		ret += fmt.Sprintln(lr)
+	}
+	return strings.TrimSpace(ret)
+}
+
+//libProcessResult contains info about a completed process.
+type libProcessResult struct {
+	LibraryName string `json:"libraryName"`
+	Result      string `json:"result"`
+}
+
+// String returns a string representation of the object.
+func (lr libProcessResult) String() string {
+	return strings.TrimSpace(fmt.Sprintf("%s - %s", lr.LibraryName, lr.Result))
+}