Implemented GRPC LibraryUpgradeAll command

Author: cmaglie

cli/lib/upgrade.go

@@ -18,11 +18,15 @@
 package lib
 
 import (
-	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
+	"os"
+
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands/lib"
+	"github.com/arduino/arduino-cli/common/formatter"
+	"github.com/arduino/arduino-cli/rpc"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 func initUpgradeCommand() *cobra.Command {
@@ -39,14 +43,15 @@ func initUpgradeCommand() *cobra.Command {
 }
 
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
-	lm := cli.InitLibraryManager(cli.Config)
-	list := lib.ListLibraries(lm, true)
-	libReleases := []*librariesindex.Release{}
-	for _, upgradeDesc := range list.Libraries {
-		libReleases = append(libReleases, upgradeDesc.Available)
+	instance := cli.CreateInstance()
+
+	err := lib.LibraryUpgradeAll(context.Background(), &rpc.LibraryUpgradeAllReq{
+		Instance: instance,
+	}, cli.OutputProgressBar(), cli.OutputTaskProgress())
+	if err != nil {
+		formatter.PrintError(err, "Error upgrading libraries")
+		os.Exit(cli.ErrGeneric)
 	}
 
-	//downloadLibraries(lm, libReleases)
-	//installLibraries(lm, libReleases)
 	logrus.Info("Done")
 }

commands/lib/download.go

@@ -40,17 +40,23 @@ func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadReq, downloadC
 		return nil, fmt.Errorf("looking for library: %s", err)
 	}
 
-	if err := downloadLibrary(lm, lib, downloadCB); err != nil {
+	if err := downloadLibrary(lm, lib, downloadCB, func(*rpc.TaskProgress) {}); err != nil {
 		return nil, err
 	}
 
 	return &rpc.LibraryDownloadResp{}, nil
 }
 
-func downloadLibrary(lm *librariesmanager.LibrariesManager, libRelease *librariesindex.Release, downloadCB commands.DownloadProgressCB) error {
-	d, err := libRelease.Resource.Download(lm.DownloadsDir)
-	if err != nil {
-		return fmt.Errorf("download error: %s", err)
+func downloadLibrary(lm *librariesmanager.LibrariesManager, libRelease *librariesindex.Release,
+	downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB) error {
+
+	taskCB(&rpc.TaskProgress{Name: "Downloading " + libRelease.String()})
+	if d, err := libRelease.Resource.Download(lm.DownloadsDir); err != nil {
+		return err
+	} else if err := commands.Download(d, libRelease.String(), downloadCB); err != nil {
+		return err
 	}
-	return commands.Download(d, libRelease.String(), downloadCB)
+	taskCB(&rpc.TaskProgress{Completed: true})
+
+	return nil
 }

commands/lib/install.go

@@ -21,6 +21,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
+	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/rpc"
 	"github.com/sirupsen/logrus"
@@ -36,12 +38,21 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallReq,
 		return fmt.Errorf("looking for library: %s", err)
 	}
 
-	taskCB(&rpc.TaskProgress{Name: "Downloading " + libRelease.String()})
-	if err := downloadLibrary(lm, libRelease, downloadCB); err != nil {
+	if err := downloadLibrary(lm, libRelease, downloadCB, taskCB); err != nil {
+		return fmt.Errorf("downloading library: %s", err)
+	}
+
+	if err := installLibrary(lm, libRelease, taskCB); err != nil {
 		return err
 	}
-	taskCB(&rpc.TaskProgress{Completed: true})
 
+	if _, err := commands.Rescan(ctx, &rpc.RescanReq{Instance: req.Instance}); err != nil {
+		return fmt.Errorf("rescanning libraries: %s", err)
+	}
+	return nil
+}
+
+func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *librariesindex.Release, taskCB commands.TaskProgressCB) error {
 	taskCB(&rpc.TaskProgress{Name: "Installing " + libRelease.String()})
 	logrus.WithField("library", libRelease).Info("Installing library")
 	libPath, libReplaced, err := lm.InstallPrerequisiteCheck(libRelease)
@@ -56,8 +67,5 @@ func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallReq,
 	}
 	taskCB(&rpc.TaskProgress{Completed: true})
 
-	if _, err := commands.Rescan(ctx, &rpc.RescanReq{Instance: req.Instance}); err != nil {
-		return fmt.Errorf("rescanning libraries: %s", err)
-	}
 	return nil
 }

commands/lib/upgrade.go

@@ -18,35 +18,30 @@
 package lib
 
 import (
-	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
-	"github.com/arduino/arduino-cli/cli"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"context"
+	"fmt"
+
+	"github.com/arduino/arduino-cli/commands"
+	"github.com/arduino/arduino-cli/rpc"
 )
 
-func initUpgradeCommand() *cobra.Command {
-	listCommand := &cobra.Command{
-		Use:   "upgrade",
-		Short: "Upgrades installed libraries.",
-		Long: "This command ungrades all installed libraries to the latest available version." +
-			"To upgrade a single library use the 'install' command.",
-		Example: "  " + cli.AppName + " lib upgrade",
-		Args:    cobra.NoArgs,
-		Run:     runUpgradeCommand,
-	}
-	return listCommand
-}
+func LibraryUpgradeAll(ctx context.Context, req *rpc.LibraryUpgradeAllReq, downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB) error {
+	lm := commands.GetLibraryManager(req)
 
-func runUpgradeCommand(cmd *cobra.Command, args []string) {
-	lm := cli.InitLibraryManager(cli.Config)
+	// Obtain the list of upgradable libraries
 	list := ListLibraries(lm, true)
-	libReleases := []*librariesindex.Release{}
-	for _, upgradeDesc := range list.Libraries {
-		libReleases = append(libReleases, upgradeDesc.Available)
-		//downloadLibrary(lm, upgradeDesc.Available)
 
+	for _, upgradeDesc := range list.Libraries {
+		if err := downloadLibrary(lm, upgradeDesc.Available, downloadCB, taskCB); err != nil {
+			return err
+		}
+	}
+	for _, upgradeDesc := range list.Libraries {
+		installLibrary(lm, upgradeDesc.Available, taskCB)
 	}
-	//installLibraries(lm, libReleases)
 
-	logrus.Info("Done")
+	if _, err := commands.Rescan(ctx, &rpc.RescanReq{Instance: req.Instance}); err != nil {
+		return fmt.Errorf("rescanning libraries: %s", err)
+	}
+	return nil
 }

daemon/client/client.go

@@ -252,7 +252,8 @@ func main() {
 		}
 		if err != nil {
 			fmt.Printf("Upload error: %s\n", err)
-			os.Exit(1)
+			// os.Exit(1)
+			break
 		}
 		if resp := uplResp.GetOutStream(); resp != nil {
 			fmt.Printf(">> STDOUT: %s", resp)
@@ -349,15 +350,42 @@ func main() {
 		}
 	}
 
-	libInstall("0.15.2") // Install
-	libInstall("0.15.3") // Replace
+	libInstall("0.15.1") // Install
+	libInstall("0.15.2") // Replace
+
+	// LIB UPGRADE
+	fmt.Println("=== calling LibraryUpgradeAll()")
+	libUpgradeAllRespStream, err := client.LibraryUpgradeAll(context.Background(), &rpc.LibraryUpgradeAllReq{
+		Instance: instance,
+	})
+	if err != nil {
+		fmt.Printf("Error upgrading all: %s\n", err)
+		os.Exit(1)
+	}
+	for {
+		resp, err := libUpgradeAllRespStream.Recv()
+		if err == io.EOF {
+			fmt.Printf("---> %+v\n", resp)
+			fmt.Println()
+			break
+		}
+		if err != nil {
+			fmt.Printf("upgrading error: %s\n", err)
+			os.Exit(1)
+		}
+		if resp.GetProgress() != nil {
+			fmt.Printf(">> DOWNLOAD: %s\n", resp.GetProgress())
+		}
+		if resp.GetTaskProgress() != nil {
+			fmt.Printf(">> TASK: %s\n", resp.GetTaskProgress())
+		}
+	}
 
 	// LIB UNINSTALL
-	fmt.Println("=== calling LibraryUninstall(WiFi101@0.15.3)")
+	fmt.Println("=== calling LibraryUninstall(WiFi101)")
 	libUninstallRespStream, err := client.LibraryUninstall(context.Background(), &rpc.LibraryUninstallReq{
 		Instance: instance,
 		Name:     "WiFi101",
-		Version:  "0.15.3",
 	})
 	if err != nil {
 		fmt.Printf("Error uninstalling: %s\n", err)

daemon/daemon.go

@@ -205,3 +205,14 @@ func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReq, s
 	}
 	return stream.Send(&rpc.LibraryUninstallResp{})
 }
+
+func (s *ArduinoCoreServerImpl) LibraryUpgradeAll(req *rpc.LibraryUpgradeAllReq, stream rpc.ArduinoCore_LibraryUpgradeAllServer) error {
+	err := lib.LibraryUpgradeAll(stream.Context(), req,
+		func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryUpgradeAllResp{Progress: p}) },
+		func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUpgradeAllResp{TaskProgress: p}) },
+	)
+	if err != nil {
+		return err
+	}
+	return stream.Send(&rpc.LibraryUpgradeAllResp{})
+}