Ultra-simplified 'outdated' 'update' and 'upgrade'

Author: cmaglie

cli/outdated/outdated.go

@@ -16,17 +16,13 @@
 package outdated
 
 import (
-	"context"
 	"os"
 
-	"github.com/arduino/arduino-cli/cli/errorcodes"
-	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cli/cli/core"
 	"github.com/arduino/arduino-cli/cli/instance"
-	"github.com/arduino/arduino-cli/commands/core"
-	"github.com/arduino/arduino-cli/commands/lib"
+	"github.com/arduino/arduino-cli/cli/lib"
 	"github.com/arduino/arduino-cli/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/table"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -44,57 +40,17 @@ that can be upgraded. If nothing needs to be updated the output is empty.`),
 		Args:    cobra.NoArgs,
 		Run:     runOutdatedCommand,
 	}
-
 	return outdatedCommand
 }
 
 func runOutdatedCommand(cmd *cobra.Command, args []string) {
 	inst := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli outdated`")
-
-	outdatedResp, err := outdated.Outdated(context.Background(), &rpc.OutdatedRequest{
-		Instance: inst,
-	})
-	if err != nil {
-		feedback.Errorf(tr("Error retrieving outdated cores and libraries: %v"), err)
-	}
-
-	feedback.PrintResult(outdatedResult{
-		Platforms: outdatedResp.OutdatedPlatforms,
-		Libraries: outdatedResp.OutdatedLibraries})
-}
-
-// output from this command requires special formatting, let's create a dedicated
-// feedback.Result implementation
-type outdatedResult struct {
-	Platforms []*rpc.Platform
-	Libraries []*rpc.InstalledLibrary
+	Outdated(inst)
 }
 
-func (or outdatedResult) Data() interface{} {
-	return or
-}
-
-func (or outdatedResult) String() string {
-	// Prints outdated cores
-	t1 := table.New()
-	if len(or.Platforms) > 0 {
-		t1.SetHeader(tr("ID"), tr("Installed version"), tr("New version"), tr("Name"))
-		for _, p := range or.Platforms {
-			t1.AddRow(p.Id, p.Installed, p.Latest, p.Name)
-		}
-	}
-
-	// Prints outdated libraries
-	t2 := table.New()
-	if len(or.Libraries) > 0 {
-		t2.SetHeader(tr("Library name"), tr("Installed version"), tr("New version"))
-		for _, l := range or.Libraries {
-			t2.AddRow(l.Library.Name, l.Library.Version, l.Release.Version)
-		}
-	}
-	if len(or.Libraries) > 0 && len(or.Platforms) > 0 {
-		return t1.Render() + "\n" + t2.Render() // handle the new line between tables
-	}
-	return t1.Render() + t2.Render()
+// Outdated returns a list of outdated platforms and libraries
+func Outdated(inst *rpc.Instance) {
+	core.List(inst, false, true)
+	lib.List(inst, []string{}, false, true)
 }

cli/update/update.go

@@ -16,18 +16,13 @@
 package update
 
 import (
-	"context"
 	"os"
 
-	"github.com/arduino/arduino-cli/cli/errorcodes"
-	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cli/cli/core"
 	"github.com/arduino/arduino-cli/cli/instance"
-	"github.com/arduino/arduino-cli/cli/output"
-	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/commands/outdated"
+	"github.com/arduino/arduino-cli/cli/lib"
+	"github.com/arduino/arduino-cli/cli/outdated"
 	"github.com/arduino/arduino-cli/i18n"
-	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/table"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -55,49 +50,10 @@ var updateFlags struct {
 func runUpdateCommand(cmd *cobra.Command, args []string) {
 	inst := instance.CreateInstanceAndRunFirstUpdate()
 	logrus.Info("Executing `arduino-cli update`")
-
-	err := commands.UpdateCoreLibrariesIndex(context.Background(),
-		&rpc.UpdateCoreLibrariesIndexRequest{Instance: inst},
-		output.ProgressBar())
-	if err != nil {
-		feedback.Errorf(tr("Error updating core and libraries index: %v"), err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
-
+	lib.UpdateIndex(inst)
+	core.UpdateIndex(inst)
+	instance.Init(inst)
 	if updateFlags.showOutdated {
-		// To show outdated platforms and libraries we need to initialize our instance
-		// otherwise nothing would be shown
-		for _, err := range instance.Init(inst) {
-			feedback.Errorf(tr("Error initializing instance: %v"), err)
-		}
-
-		outdatedResp, err := outdated.Outdated(context.Background(), &rpc.OutdatedRequest{
-			Instance: inst,
-		})
-		if err != nil {
-			feedback.Errorf(tr("Error retrieving outdated cores and libraries: %v"), err)
-		}
-
-		// Prints outdated cores
-		tab := table.New()
-		tab.SetHeader(tr("Core name"), tr("Installed version"), tr("New version"))
-		if len(outdatedResp.OutdatedPlatforms) > 0 {
-			for _, p := range outdatedResp.OutdatedPlatforms {
-				tab.AddRow(p.Name, p.Installed, p.Latest)
-			}
-			feedback.Print(tab.Render())
-		}
-
-		// Prints outdated libraries
-		tab = table.New()
-		tab.SetHeader(tr("Library name"), tr("Installed version"), tr("New version"))
-		if len(outdatedResp.OutdatedLibraries) > 0 {
-			for _, l := range outdatedResp.OutdatedLibraries {
-				tab.AddRow(l.Library.Name, l.Library.Version, l.Release.Version)
-			}
-			feedback.Print(tab.Render())
-		}
+		outdated.Outdated(inst)
 	}
-
-	logrus.Info("Done")
 }

cli/upgrade/upgrade.go

@@ -16,52 +16,39 @@
 package upgrade
 
 import (
-	"context"
 	"os"
 
 	"github.com/arduino/arduino-cli/cli/arguments"
-	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cli/cli/core"
 	"github.com/arduino/arduino-cli/cli/instance"
-	"github.com/arduino/arduino-cli/cli/output"
-	"github.com/arduino/arduino-cli/commands/upgrade"
+	"github.com/arduino/arduino-cli/cli/lib"
 	"github.com/arduino/arduino-cli/i18n"
-	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
-var (
-	tr               = i18n.Tr
-	postInstallFlags arguments.PostInstallFlags
-)
+var tr = i18n.Tr
 
 // NewCommand creates a new `upgrade` command
 func NewCommand() *cobra.Command {
+	var postInstallFlags arguments.PostInstallFlags
 	upgradeCommand := &cobra.Command{
 		Use:     "upgrade",
 		Short:   tr("Upgrades installed cores and libraries."),
 		Long:    tr("Upgrades installed cores and libraries to latest version."),
 		Example: "  " + os.Args[0] + " upgrade",
 		Args:    cobra.NoArgs,
-		Run:     runUpgradeCommand,
+		Run: func(cmd *cobra.Command, args []string) {
+			runUpgradeCommand(postInstallFlags.DetectSkipPostInstallValue())
+		},
 	}
-
 	postInstallFlags.AddToCommand(upgradeCommand)
 	return upgradeCommand
 }
 
-func runUpgradeCommand(cmd *cobra.Command, args []string) {
+func runUpgradeCommand(skipPostInstall bool) {
 	inst := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli upgrade`")
-
-	err := upgrade.Upgrade(context.Background(), &rpc.UpgradeRequest{
-		Instance:        inst,
-		SkipPostInstall: postInstallFlags.DetectSkipPostInstallValue(),
-	}, output.NewDownloadProgressBarCB(), output.TaskProgress())
-
-	if err != nil {
-		feedback.Errorf(tr("Error upgrading: %v"), err)
-	}
-
-	logrus.Info("Done")
+	lib.Upgrade(inst, []string{})
+	core.Upgrade(inst, []string{}, skipPostInstall)
 }