Moved uninstallToolRelease into the proper packagamanger method

Author: cmaglie

arduino/cores/packagemanager/install_uninstall.go

@@ -182,20 +182,31 @@ func (pm *PackageManager) IsManagedToolRelease(toolRelease *cores.ToolRelease) b
 }
 
 // UninstallTool remove a ToolRelease.
-func (pm *PackageManager) UninstallTool(toolRelease *cores.ToolRelease) error {
+func (pm *PackageManager) UninstallTool(toolRelease *cores.ToolRelease, taskCB rpc.TaskProgressCB) error {
+	log := pm.Log.WithField("Tool", toolRelease)
+	log.Info("Uninstalling tool")
+
 	if toolRelease.InstallDir == nil {
 		return fmt.Errorf(tr("tool not installed"))
 	}
 
 	// Safety measure
 	if !pm.IsManagedToolRelease(toolRelease) {
-		return fmt.Errorf(tr("tool %s is not managed by package manager"), toolRelease)
+		err := &arduino.FailedUninstallError{Message: tr("tool %s is not managed by package manager", toolRelease)}
+		log.WithError(err).Error("Error uninstalling")
+		return err
 	}
 
 	if err := toolRelease.InstallDir.RemoveAll(); err != nil {
-		return fmt.Errorf(tr("removing tool files: %s"), err)
+		err = &arduino.FailedUninstallError{Message: err.Error()}
+		log.WithError(err).Error("Error uninstalling")
+		return err
 	}
+
 	toolRelease.InstallDir = nil
+
+	log.Info("Tool uninstalled")
+	taskCB(&rpc.TaskProgress{Message: tr("Tool %s uninstalled", toolRelease), Completed: true})
 	return nil
 }
 

commands/core/install.go

@@ -163,8 +163,9 @@ func installPlatform(pm *packagemanager.PackageManager,
 
 		// Uninstall unused tools
 		for _, tool := range installedTools {
+			taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s, tool is no more required", tool)})
 			if !pm.IsToolRequired(tool) {
-				uninstallToolRelease(pm, tool, taskCB)
+				pm.UninstallTool(tool, taskCB)
 			}
 		}
 

commands/core/uninstall.go

@@ -59,7 +59,8 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallRequest, t
 
 	for _, tool := range tools {
 		if !pm.IsToolRequired(tool) {
-			uninstallToolRelease(pm, tool, taskCB)
+			taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s, tool is no more required", tool)})
+			pm.UninstallTool(tool, taskCB)
 		}
 	}
 
@@ -85,19 +86,3 @@ func uninstallPlatformRelease(pm *packagemanager.PackageManager, platformRelease
 	taskCB(&rpc.TaskProgress{Message: tr("Platform %s uninstalled", platformRelease), Completed: true})
 	return nil
 }
-
-func uninstallToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.ToolRelease, taskCB rpc.TaskProgressCB) error {
-	log := pm.Log.WithField("Tool", toolRelease)
-
-	log.Info("Uninstalling tool")
-	taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s, tool is no more required", toolRelease)})
-
-	if err := pm.UninstallTool(toolRelease); err != nil {
-		log.WithError(err).Error("Error uninstalling")
-		return &arduino.FailedUninstallError{Message: tr("Error uninstalling tool %s", toolRelease), Cause: err}
-	}
-
-	log.Info("Tool uninstalled")
-	taskCB(&rpc.TaskProgress{Message: tr("Tool %s uninstalled", toolRelease), Completed: true})
-	return nil
-}

commands/instances.go

@@ -795,8 +795,7 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeRequest, downloadCB rpc.Downlo
 
 						log.Info("Uninstalling tool")
 						taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s: tool is no more required", toolRelease)})
-
-						if err := pm.UninstallTool(toolRelease); err != nil {
+						if err := pm.UninstallTool(toolRelease, taskCB); err != nil {
 							log.WithError(err).Error("Error uninstalling")
 							return &arduino.FailedInstallError{Message: tr("Error uninstalling tool %s", toolRelease), Cause: err}
 						}