Added gRPC LibraryUpgrade call and fixed 'lib upgrade' command

arduino · cmaglie · Aug 26, 2022 · Aug 5, 2022 · Aug 22, 2022 · Aug 3, 2022
commit e8ef962b9e770733a13e0a643d2d097662884b3d
diff --git a/cli/lib/upgrade.go b/cli/lib/upgrade.go
@@ -16,6 +16,7 @@
 package lib

 import (
+	"context"
 	"os"

 	"github.com/arduino/arduino-cli/cli/errorcodes"
@@ -46,19 +47,27 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
 	instance := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli lib upgrade`")

+	var upgradeErr error
 	if len(args) == 0 {
-		err := lib.LibraryUpgradeAll(&rpc.LibraryUpgradeAllRequest{Instance: instance}, output.ProgressBar(), output.TaskProgress())
-		if err != nil {
-			feedback.Errorf(tr("Error upgrading libraries: %v"), err)
-			os.Exit(errorcodes.ErrGeneric)
-		}
+		req := &rpc.LibraryUpgradeAllRequest{Instance: instance}
+		upgradeErr = lib.LibraryUpgradeAll(req, output.ProgressBar(), output.TaskProgress())
 	} else {
-		err := lib.LibraryUpgrade(instance.Id, args, output.ProgressBar(), output.TaskProgress())
-		if err != nil {
-			feedback.Errorf(tr("Error upgrading libraries: %v"), err)
-			os.Exit(errorcodes.ErrGeneric)
+		for _, libName := range args {
+			req := &rpc.LibraryUpgradeRequest{
+				Instance: instance,
+				Name:     libName,
+			}
+			upgradeErr = lib.LibraryUpgrade(context.Background(), req, output.ProgressBar(), output.TaskProgress())
+			if upgradeErr != nil {
+				break
+			}
 		}
 	}

+	if upgradeErr != nil {
+		feedback.Errorf("%s: %v", tr("Error upgrading libraries"), upgradeErr)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+
 	logrus.Info("Done")
 }
diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go
@@ -423,6 +423,19 @@ func (s *ArduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallRequest, s
 	return stream.Send(&rpc.LibraryInstallResponse{})
 }

+// LibraryUpgrade FIXMEDOC
+func (s *ArduinoCoreServerImpl) LibraryUpgrade(req *rpc.LibraryUpgradeRequest, stream rpc.ArduinoCoreService_LibraryUpgradeServer) error {
+	err := lib.LibraryUpgrade(
+		stream.Context(), req,
+		func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryUpgradeResponse{Progress: p}) },
+		func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUpgradeResponse{TaskProgress: p}) },
+	)
+	if err != nil {
+		return convertErrorToRPCStatus(err)
+	}
+	return stream.Send(&rpc.LibraryUpgradeResponse{})
+}
+
 // LibraryUninstall FIXMEDOC
 func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallRequest, stream rpc.ArduinoCoreService_LibraryUninstallServer) error {
 	err := lib.LibraryUninstall(stream.Context(), req,

diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go
@@ -16,6 +16,7 @@
 package lib

 import (
+	"context"
 	"errors"

 	"github.com/arduino/arduino-cli/arduino"
@@ -42,12 +43,15 @@ func LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, downloadCB rpc.Downloa
 	return nil
 }

-func LibraryUpgrade(lm *librariesmanager.LibrariesManager, libraryNames []string, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
+// LibraryUpgrade upgrades a library
+func LibraryUpgrade(ctx context.Context, req *rpc.LibraryUpgradeRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
+	lm := commands.GetLibraryManager(req)
+
 	// get the libs to upgrade
-	libs := filterByName(listLibraries(lm, true, true), libraryNames)
+	lib := filterByName(listLibraries(lm, true, true), req.GetName())

 	// do it
-	return upgrade(lm, libs, downloadCB, taskCB)
+	return upgrade(lm, []*installedLib{lib}, downloadCB, taskCB)
 }

 func upgrade(lm *librariesmanager.LibrariesManager, libs []*installedLib, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
@@ -70,20 +74,11 @@ func upgrade(lm *librariesmanager.LibrariesManager, libs []*installedLib, downlo
 	return nil
 }

-func filterByName(libs []*installedLib, names []string) []*installedLib {
-	// put the names in a map to ease lookup
-	queryMap := make(map[string]struct{})
-	for _, name := range names {
-		queryMap[name] = struct{}{}
-	}
-
-	ret := []*installedLib{}
+func filterByName(libs []*installedLib, name string) *installedLib {
 	for _, lib := range libs {
-		// skip if library name wasn't in the query
-		if _, found := queryMap[lib.Library.RealName]; found {
-			ret = append(ret, lib)
+		if lib.Library.RealName == name {
+			return lib
 		}
 	}
-
-	return ret
+	return nil
 }
diff --git a/rpc/cc/arduino/cli/commands/v1/commands.pb.go b/rpc/cc/arduino/cli/commands/v1/commands.pb.go
diff --git a/rpc/cc/arduino/cli/commands/v1/commands.proto b/rpc/cc/arduino/cli/commands/v1/commands.proto
@@ -153,6 +153,10 @@ service ArduinoCoreService {
  rpc LibraryInstall(LibraryInstallRequest)
      returns (stream LibraryInstallResponse);

+  // Upgrade a library to the newest version available.
+  rpc LibraryUpgrade(LibraryUpgradeRequest)
+      returns (stream LibraryUpgradeResponse);
+
  // Install a library from a Zip File
  rpc ZipLibraryInstall(ZipLibraryInstallRequest)
      returns (stream ZipLibraryInstallResponse);

diff --git a/rpc/cc/arduino/cli/commands/v1/commands_grpc.pb.go b/rpc/cc/arduino/cli/commands/v1/commands_grpc.pb.go