Fixed wrong usage of DownloadProgress

Author: cmaglie

commands/instances.go

@@ -503,11 +503,11 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
 
 	failed := false
 	for _, u := range urls {
-		downloadCB(rpc.NewDownloadProgressStart(u, tr("Downloading index: %s", u)))
 		URL, err := utils.URLParse(u)
 		if err != nil {
 			logrus.Warnf("unable to parse additional URL: %s", u)
 			msg := fmt.Sprintf("%s: %v", tr("Unable to parse URL"), err)
+			downloadCB(rpc.NewDownloadProgressStart(u, tr("Downloading index: %s", u)))
 			downloadCB(rpc.NewDownloadProgressEnd(false, msg))
 			failed = true
 			continue
@@ -516,6 +516,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
 		logrus.WithField("url", URL).Print("Updating index")
 
 		if URL.Scheme == "file" {
+			downloadCB(rpc.NewDownloadProgressStart(u, tr("Downloading index: %s", u)))
 			path := paths.New(URL.Path)
 			if _, err := packageindex.LoadIndexNoSign(path); err != nil {
 				msg := fmt.Sprintf("%s: %v", tr("Invalid package index in %s", path), err)
@@ -533,10 +534,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
 			indexResource.SignatureURL.Path += ".sig"
 		}
 		if err := indexResource.Download(indexpath, downloadCB); err != nil {
-			downloadCB(rpc.NewDownloadProgressEnd(false, err.Error()))
 			failed = true
-		} else {
-			downloadCB(rpc.NewDownloadProgressEnd(true, ""))
 		}
 		continue
 	}

internal/integrationtest/daemon/daemon_core_test.go

@@ -21,7 +21,6 @@ import (
 	"io"
 	"testing"
 
-	"github.com/arduino/arduino-cli/internal/integrationtest"
 	"github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/stretchr/testify/require"
 )
@@ -42,30 +41,35 @@ func TestDaemonCoreUpdateIndex(t *testing.T) {
 			` "http://downloads.arduino.cc/package_inexistent_index.json"]`)
 	require.NoError(t, err)
 
-	analyzeUpdateIndexClient := func(cl commands.ArduinoCoreService_UpdateIndexClient) map[string]*commands.DownloadProgressEnd {
-		analyzer := integrationtest.NewDownloadProgressAnalyzer(t)
+	analyzeUpdateIndexClient := func(cl commands.ArduinoCoreService_UpdateIndexClient) (error, map[string]*commands.DownloadProgressEnd) {
+		analyzer := NewDownloadProgressAnalyzer(t)
 		for {
 			msg, err := cl.Recv()
+			// fmt.Println("DOWNLOAD>", msg)
 			if err == io.EOF {
-				break
+				return nil, analyzer.Results
+			}
+			if err != nil {
+				return err, analyzer.Results
 			}
 			require.NoError(t, err)
 			analyzer.Process(msg.GetDownloadProgress())
 		}
-		return analyzer.Results
 	}
 
 	{
 		cl, err := grpcInst.UpdateIndex(context.Background(), true)
 		require.NoError(t, err)
-		res := analyzeUpdateIndexClient(cl)
+		err, res := analyzeUpdateIndexClient(cl)
+		require.NoError(t, err)
 		require.Len(t, res, 1)
 		require.True(t, res["https://downloads.arduino.cc/packages/package_index.tar.bz2"].Success)
 	}
 	{
 		cl, err := grpcInst.UpdateIndex(context.Background(), false)
 		require.NoError(t, err)
-		res := analyzeUpdateIndexClient(cl)
+		err, res := analyzeUpdateIndexClient(cl)
+		require.Error(t, err)
 		require.Len(t, res, 3)
 		require.True(t, res["https://downloads.arduino.cc/packages/package_index.tar.bz2"].Success)
 		require.True(t, res["http://arduino.esp8266.com/stable/package_esp8266com_index.json"].Success)

internal/integrationtest/download_progress.go renamed to internal/integrationtest/daemon/download_progress_test.go

@@ -13,7 +13,7 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to [email protected].
 
-package integrationtest
+package daemon_test
 
 import (
 	"testing"