Merged InstallToolRelease function into the proper packagemanager method

Author: cmaglie

arduino/cores/packagemanager/install_uninstall.go

@@ -20,9 +20,11 @@ import (
 	"fmt"
 	"runtime"
 
+	"github.com/arduino/arduino-cli/arduino"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packageindex"
 	"github.com/arduino/arduino-cli/executils"
+	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
 	"github.com/pkg/errors"
 )
@@ -127,7 +129,18 @@ func (pm *PackageManager) UninstallPlatform(platformRelease *cores.PlatformRelea
 }
 
 // InstallTool installs a specific release of a tool.
-func (pm *PackageManager) InstallTool(toolRelease *cores.ToolRelease) error {
+func (pm *PackageManager) InstallTool(toolRelease *cores.ToolRelease, taskCB rpc.TaskProgressCB) error {
+	log := pm.Log.WithField("Tool", toolRelease)
+
+	if toolRelease.IsInstalled() {
+		log.Warn("Tool already installed")
+		taskCB(&rpc.TaskProgress{Name: tr("Tool %s already installed", toolRelease), Completed: true})
+		return nil
+	}
+
+	log.Info("Installing tool")
+	taskCB(&rpc.TaskProgress{Name: tr("Installing %s", toolRelease)})
+
 	toolResource := toolRelease.GetCompatibleFlavour()
 	if toolResource == nil {
 		return fmt.Errorf(tr("no compatible version of %s tools found for the current os"), toolRelease.Tool.Name)
@@ -137,7 +150,15 @@ func (pm *PackageManager) InstallTool(toolRelease *cores.ToolRelease) error {
 		"tools",
 		toolRelease.Tool.Name,
 		toolRelease.Version.String())
-	return toolResource.Install(pm.DownloadDir, pm.tempDir, destDir)
+	err := toolResource.Install(pm.DownloadDir, pm.tempDir, destDir)
+	if err != nil {
+		log.WithError(err).Warn("Cannot install tool")
+		return &arduino.FailedInstallError{Message: tr("Cannot install tool %s", toolRelease), Cause: err}
+	}
+	log.Info("Tool installed")
+	taskCB(&rpc.TaskProgress{Message: tr("%s installed", toolRelease), Completed: true})
+
+	return nil
 }
 
 // IsManagedToolRelease returns true if the ToolRelease is managed by the PackageManager

commands/bundled_tools.go

@@ -16,7 +16,6 @@
 package commands
 
 import (
-	"github.com/arduino/arduino-cli/arduino"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/httpclient"
@@ -31,26 +30,3 @@ func DownloadToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.T
 	}
 	return pm.DownloadToolRelease(toolRelease, config, toolRelease.String(), downloadCB)
 }
-
-// InstallToolRelease installs a ToolRelease
-func InstallToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.ToolRelease, taskCB rpc.TaskProgressCB) error {
-	log := pm.Log.WithField("Tool", toolRelease)
-
-	if toolRelease.IsInstalled() {
-		log.Warn("Tool already installed")
-		taskCB(&rpc.TaskProgress{Name: tr("Tool %s already installed", toolRelease), Completed: true})
-		return nil
-	}
-
-	log.Info("Installing tool")
-	taskCB(&rpc.TaskProgress{Name: tr("Installing %s", toolRelease)})
-	err := pm.InstallTool(toolRelease)
-	if err != nil {
-		log.WithError(err).Warn("Cannot install tool")
-		return &arduino.FailedInstallError{Message: tr("Cannot install tool %s", toolRelease), Cause: err}
-	}
-	log.Info("Tool installed")
-	taskCB(&rpc.TaskProgress{Message: tr("%s installed", toolRelease), Completed: true})
-
-	return nil
-}

commands/core/install.go

@@ -106,7 +106,7 @@ func installPlatform(pm *packagemanager.PackageManager,
 
 	// Install tools first
 	for _, tool := range toolsToInstall {
-		if err := commands.InstallToolRelease(pm, tool, taskCB); err != nil {
+		if err := pm.InstallTool(tool, taskCB); err != nil {
 			return err
 		}
 	}

commands/instances.go

@@ -99,7 +99,7 @@ func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, down
 		return false, fmt.Errorf(tr("downloading %[1]s tool: %[2]s"), tool, err)
 	}
 	taskCB(&rpc.TaskProgress{Completed: true})
-	if err := InstallToolRelease(instance.PackageManager, tool, taskCB); err != nil {
+	if err := instance.PackageManager.InstallTool(tool, taskCB); err != nil {
 		return false, fmt.Errorf(tr("installing %[1]s tool: %[2]s"), tool, err)
 	}
 	return true, nil
@@ -756,7 +756,7 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeRequest, downloadCB rpc.Downlo
 
 				// Installs tools
 				for _, tool := range toolsToInstall {
-					if err := InstallToolRelease(pm, tool, taskCB); err != nil {
+					if err := pm.InstallTool(tool, taskCB); err != nil {
 						msg := tr("Error installing tool %s", tool)
 						taskCB(&rpc.TaskProgress{Message: msg})
 						return &arduino.FailedInstallError{Message: msg, Cause: err}