Fixed progress bar in library index download

Author: cmaglie

cli/cli.go

@@ -31,6 +31,7 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/configs"
+	"github.com/arduino/arduino-cli/output"
 	"github.com/arduino/arduino-cli/rpc"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
@@ -119,6 +120,20 @@ func InitInstance(libManagerOnly bool) *rpc.InitResp {
 		}
 		os.Exit(ErrGeneric)
 	}
+	if resp.GetLibrariesIndexError() != "" {
+		commands.UpdateLibrariesIndex(context.Background(), commands.GetLibraryManager(resp), output.DownloadProgressBar())
+		rescResp, err := commands.Rescan(context.Background(), &rpc.RescanReq{Instance: resp.GetInstance()})
+		if rescResp.GetLibrariesIndexError() != "" {
+			formatter.PrintErrorMessage("Error loading library index: " + rescResp.GetLibrariesIndexError())
+			os.Exit(ErrGeneric)
+		}
+		if err != nil {
+			formatter.PrintError(err, "Error loading library index")
+			os.Exit(ErrGeneric)
+		}
+		resp.LibrariesIndexError = rescResp.LibrariesIndexError
+		resp.PlatformsIndexErrors = rescResp.PlatformsIndexErrors
+	}
 	return resp
 }
 

commands/instances.go

@@ -126,28 +126,17 @@ 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, progressCallback func(*rpc.DownloadProgress)) {
+func UpdateLibrariesIndex(ctx context.Context, lm *librariesmanager.LibrariesManager, downloadCB func(*rpc.DownloadProgress)) error {
 	logrus.Info("Updating libraries index")
 	d, err := lm.UpdateIndex()
 	if err != nil {
-		//formatter.PrintError(err, "Error downloading librarires index")
-		//os.Exit(ErrNetwork)
+		return err
 	}
-	//formatter.DownloadProgressBar(d, "Updating index: library_index.json")
-	//d.Run()
-	progressCallback(&rpc.DownloadProgress{
-		File:      "library_index.json",
-		Url:       d.URL,
-		TotalSize: d.Size(),
-	})
-	d.RunAndPoll(func(downloaded int64) {
-		progressCallback(&rpc.DownloadProgress{Downloaded: downloaded})
-	}, 250*time.Millisecond)
-
+	Download(d, "library_index.json", downloadCB)
 	if d.Error() != nil {
-		//formatter.PrintError(d.Error(), "Error downloading librarires index")
-		//os.Exit(ErrNetwork)
+		return d.Error()
 	}
+	return nil
 }
 
 func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexReq, downloadCB DownloadProgressCB) (*rpc.UpdateIndexResp, error) {