Added GRPC UpdateLibrariesIndex command

Author: cmaglie

cli/cli.go

@@ -101,7 +101,8 @@ func InitInstance(libManagerOnly bool) *rpc.InitResp {
 		os.Exit(ErrGeneric)
 	}
 	if resp.GetLibrariesIndexError() != "" {
-		commands.UpdateLibrariesIndex(context.Background(), commands.GetLibraryManager(resp), OutputProgressBar())
+		commands.UpdateLibrariesIndex(context.Background(),
+			&rpc.UpdateLibrariesIndexReq{Instance: resp.GetInstance()}, OutputProgressBar())
 		rescResp, err := commands.Rescan(context.Background(), &rpc.RescanReq{Instance: resp.GetInstance()})
 		if rescResp.GetLibrariesIndexError() != "" {
 			formatter.PrintErrorMessage("Error loading library index: " + rescResp.GetLibrariesIndexError())

cli/lib/update_index.go

@@ -24,6 +24,7 @@ import (
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
+	"github.com/arduino/arduino-cli/rpc"
 	"github.com/spf13/cobra"
 )
 
@@ -35,8 +36,10 @@ func initUpdateIndexCommand() *cobra.Command {
 		Example: "  " + cli.AppName + " lib update-index",
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			lm := cli.InitLibraryManager(cli.Config)
-			err := commands.UpdateLibrariesIndex(context.Background(), lm, cli.OutputProgressBar())
+			instance := cli.CreateInstance()
+			err := commands.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexReq{
+				Instance: instance,
+			}, cli.OutputProgressBar())
 			if err != nil {
 				formatter.PrintError(err, "Error updating library index")
 				os.Exit(cli.ErrGeneric)

commands/instances.go

@@ -126,8 +126,12 @@ func Destroy(ctx context.Context, req *rpc.DestroyReq) (*rpc.DestroyResp, error)
 }
 
 // UpdateLibrariesIndex updates the library_index.json
-func UpdateLibrariesIndex(ctx context.Context, lm *librariesmanager.LibrariesManager, downloadCB func(*rpc.DownloadProgress)) error {
+func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexReq, downloadCB func(*rpc.DownloadProgress)) error {
 	logrus.Info("Updating libraries index")
+	lm := GetLibraryManager(req)
+	if lm == nil {
+		return fmt.Errorf("invalid handle")
+	}
 	d, err := lm.UpdateIndex()
 	if err != nil {
 		return err
@@ -136,6 +140,9 @@ func UpdateLibrariesIndex(ctx context.Context, lm *librariesmanager.LibrariesMan
 	if d.Error() != nil {
 		return d.Error()
 	}
+	if _, err := Rescan(ctx, &rpc.RescanReq{Instance: req.Instance}); err != nil {
+		return fmt.Errorf("rescanning filesystem: %s", err)
+	}
 	return nil
 }
 
@@ -182,7 +189,9 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexReq, downloadCB Downlo
 			return nil, fmt.Errorf("saving downloaded index %s: %s", URL, err)
 		}
 	}
-	Rescan(ctx, &rpc.RescanReq{Instance: req.Instance})
+	if _, err := Rescan(ctx, &rpc.RescanReq{Instance: req.Instance}); err != nil {
+		return nil, fmt.Errorf("rescanning filesystem: %s", err)
+	}
 	return &rpc.UpdateIndexResp{}, nil
 }
 

daemon/client/client.go

@@ -292,6 +292,29 @@ func main() {
 		}
 	}
 
+	// LIB UPDATE INDEX
+	fmt.Println("=== calling UpdateLibrariesIndex()")
+	libIdxUpdateStream, err := client.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexReq{Instance: instance})
+	if err != nil {
+		fmt.Printf("Error updating libraries index: %s\n", err)
+		os.Exit(1)
+	}
+	for {
+		resp, err := libIdxUpdateStream.Recv()
+		if err == io.EOF {
+			fmt.Printf("---> %+v\n", resp)
+			fmt.Println()
+			break
+		}
+		if err != nil {
+			fmt.Printf("Error updating libraries index: %s\n", err)
+			os.Exit(1)
+		}
+		if resp.GetDownloadProgress() != nil {
+			fmt.Printf(">> DOWNLOAD: %s\n", resp.GetDownloadProgress())
+		}
+	}
+
 	// LIB DOWNLOAD
 	fmt.Println("=== calling LibraryDownload([email protected])")
 	downloadRespStream, err := client.LibraryDownload(context.Background(), &rpc.LibraryDownloadReq{

daemon/daemon.go

@@ -76,6 +76,16 @@ func (s *ArduinoCoreServerImpl) UpdateIndex(req *rpc.UpdateIndexReq, stream rpc.
 	return err
 }
 
+func (s *ArduinoCoreServerImpl) UpdateLibrariesIndex(req *rpc.UpdateLibrariesIndexReq, stream rpc.ArduinoCore_UpdateLibrariesIndexServer) error {
+	err := commands.UpdateLibrariesIndex(stream.Context(), req,
+		func(p *rpc.DownloadProgress) { stream.Send(&rpc.UpdateLibrariesIndexResp{DownloadProgress: p}) },
+	)
+	if err != nil {
+		return err
+	}
+	return stream.Send(&rpc.UpdateLibrariesIndexResp{})
+}
+
 func (s *ArduinoCoreServerImpl) Init(ctx context.Context, req *rpc.InitReq) (*rpc.InitResp, error) {
 	return commands.Init(ctx, req)
 }
@@ -88,8 +98,10 @@ func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoC
 		func(p *rpc.TaskProgress) { stream.Send(&rpc.CompileResp{TaskProgress: p}) },
 		func(p *rpc.DownloadProgress) { stream.Send(&rpc.CompileResp{DownloadProgress: p}) },
 	)
-	stream.Send(resp)
-	return err
+	if err != nil {
+		return err
+	}
+	return stream.Send(resp)
 }
 
 func (s *ArduinoCoreServerImpl) PlatformInstall(req *rpc.PlatformInstallReq, stream rpc.ArduinoCore_PlatformInstallServer) error {