Implemented RPC call LibraryUninstall

Author: cmaglie

cli/lib/uninstall.go

@@ -43,18 +43,21 @@ func initUninstallCommand() *cobra.Command {
 }
 
 func runUninstallCommand(cmd *cobra.Command, args []string) {
+	logrus.Info("Executing `arduino lib uninstall`")
+
 	instance := cli.CreateInstance()
 	libRefs, err := librariesindex.ParseArgs(args)
 	if err != nil {
 		formatter.PrintError(err, "Arguments error")
 		os.Exit(cli.ErrBadArgument)
 	}
+
 	for _, library := range libRefs {
 		lib.LibraryUninstall(context.Background(), &rpc.LibraryUninstallReq{
 			Instance: instance,
 			Name:     library.Name,
 			Version:  library.Version.String(),
-		})
+		}, cli.OutputTaskProgress())
 	}
 
 	logrus.Info("Done")

commands/lib/uninstall.go

@@ -24,28 +24,28 @@ import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/rpc"
-	"github.com/sirupsen/logrus"
 	semver "go.bug.st/relaxed-semver"
 )
 
-func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallReq) (*rpc.LibraryUninstallResp, error) {
-	logrus.Info("Executing `arduino lib uninstall`")
-
+func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallReq, taskCB commands.TaskProgressCB) error {
 	lm := commands.GetLibraryManager(req)
 	var version *semver.Version
-	if v, err := semver.Parse(req.GetVersion()); err == nil {
-		version = v
-	} else {
-		return nil, fmt.Errorf("invalid version: %s", err)
+	if req.GetVersion() != "" {
+		if v, err := semver.Parse(req.GetVersion()); err == nil {
+			version = v
+		} else {
+			return fmt.Errorf("invalid version: %s", err)
+		}
 	}
 	ref := &librariesindex.Reference{Name: req.GetName(), Version: version}
 	lib := lm.FindByReference(ref)
 	if lib == nil {
-		return nil, fmt.Errorf("library not installed: %s", ref.String())
-	} else {
-		//	formatter.Print("Uninstalling " + lib.String()) tramite il CBTAsk
-		lm.Uninstall(lib)
+		return fmt.Errorf("library not installed: %s", ref.String())
 	}
 
-	return &rpc.LibraryUninstallResp{}, nil
+	taskCB(&rpc.TaskProgress{Name: "Uninstalling " + lib.String()})
+	lm.Uninstall(lib)
+	taskCB(&rpc.TaskProgress{Completed: true})
+
+	return nil
 }

daemon/client/client.go

@@ -354,7 +354,7 @@ func main() {
 
 	// LIB UNINSTALL
 	fmt.Println("=== calling LibraryUninstall(WiFi101@0.15.3)")
-	libUninstallResp, err := client.LibraryUninstall(context.Background(), &rpc.LibraryUninstallReq{
+	libUninstallRespStream, err := client.LibraryUninstall(context.Background(), &rpc.LibraryUninstallReq{
 		Instance: instance,
 		Name:     "WiFi101",
 		Version:  "0.15.3",
@@ -363,8 +363,21 @@ func main() {
 		fmt.Printf("Error uninstalling: %s\n", err)
 		os.Exit(1)
 	}
-	fmt.Printf("---> %+v\n", libUninstallResp)
-	fmt.Println()
+	for {
+		uninstallResp, err := libUninstallRespStream.Recv()
+		if err == io.EOF {
+			fmt.Printf("---> %+v\n", uninstallResp)
+			fmt.Println()
+			break
+		}
+		if err != nil {
+			fmt.Printf("uninstall error: %s\n", err)
+			os.Exit(1)
+		}
+		if uninstallResp.GetTaskProgress() != nil {
+			fmt.Printf(">> TASK: %s\n", uninstallResp.GetTaskProgress())
+		}
+	}
 
 	// DESTROY
 	fmt.Println("=== calling Destroy()")

daemon/daemon.go

@@ -196,6 +196,12 @@ func (s *ArduinoCoreServerImpl) LibraryInstall(req *rpc.LibraryInstallReq, strea
 	return stream.Send(&rpc.LibraryInstallResp{})
 }
 
-func (s *ArduinoCoreServerImpl) LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallReq) (*rpc.LibraryUninstallResp, error) {
-	return lib.LibraryUninstall(ctx, req)
+func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReq, stream rpc.ArduinoCore_LibraryUninstallServer) error {
+	err := lib.LibraryUninstall(stream.Context(), req,
+		func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUninstallResp{TaskProgress: p}) },
+	)
+	if err != nil {
+		return err
+	}
+	return stream.Send(nil)
 }

rpc/commands.pb.go

@@ -70,7 +70,7 @@ service ArduinoCore {
 
   rpc LibraryInstall(LibraryInstallReq) returns (stream LibraryInstallResp);
 
-  rpc LibraryUninstall(LibraryUninstallReq) returns (LibraryUninstallResp);
+  rpc LibraryUninstall(LibraryUninstallReq) returns (stream LibraryUninstallResp);
 }
 
 // Configuration contains information to instantiate an Arduino Platform Service

rpc/commands.proto

@@ -23,7 +23,6 @@ option go_package = "github.com/arduino/arduino-cli/rpc";
 
 import "common.proto";
 
-
 message LibraryDownloadReq {
     Instance instance = 1;
     string name = 2;
@@ -52,5 +51,5 @@ message LibraryUninstallReq {
 }
 
 message LibraryUninstallResp {
-
+    TaskProgress task_progress = 1;
 }