Moved downloadToolRelease into the proper packagamanger method

Author: cmaglie

arduino/cores/packagemanager/download.go

@@ -118,13 +118,13 @@ func (pm *PackageManager) FindPlatformReleaseDependencies(item *PlatformReferenc
 }
 
 // DownloadToolRelease downloads a ToolRelease. If the tool is already downloaded a nil Downloader
-// is returned.
-func (pm *PackageManager) DownloadToolRelease(tool *cores.ToolRelease, config *downloader.Config, label string, progressCB rpc.DownloadProgressCB) error {
+// is returned. Uses the given downloader configuration for download, or the default config if nil.
+func (pm *PackageManager) DownloadToolRelease(tool *cores.ToolRelease, config *downloader.Config, progressCB rpc.DownloadProgressCB) error {
 	resource := tool.GetCompatibleFlavour()
 	if resource == nil {
 		return fmt.Errorf(tr("tool not available for your OS"))
 	}
-	return resource.Download(pm.DownloadDir, config, label, progressCB)
+	return resource.Download(pm.DownloadDir, config, tool.String(), progressCB)
 }
 
 // DownloadPlatformRelease downloads a PlatformRelease. If the platform is already downloaded a

commands/bundled_tools.go

@@ -82,7 +82,7 @@ func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, do
 			Cause:   errors.New(tr("no versions available for the current OS", tool))}
 	}
 
-	if err := commands.DownloadToolRelease(pm, tool, downloadCB); err != nil {
+	if err := pm.DownloadToolRelease(tool, nil, downloadCB); err != nil {
 		return &arduino.FailedDownloadError{Message: tr("Error downloading tool %s", tool), Cause: err}
 	}
 

commands/core/download.go

@@ -95,7 +95,7 @@ func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, down
 		return false, nil
 	}
 	taskCB(&rpc.TaskProgress{Name: tr("Downloading missing tool %s", tool)})
-	if err := DownloadToolRelease(instance.PackageManager, tool, downloadCB); err != nil {
+	if err := instance.PackageManager.DownloadToolRelease(tool, nil, downloadCB); err != nil {
 		return false, fmt.Errorf(tr("downloading %[1]s tool: %[2]s"), tool, err)
 	}
 	taskCB(&rpc.TaskProgress{Completed: true})
@@ -739,7 +739,7 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeRequest, downloadCB rpc.Downlo
 
 				// Downloads platform tools
 				for _, tool := range toolsToInstall {
-					if err := DownloadToolRelease(pm, tool, downloadCB); err != nil {
+					if err := pm.DownloadToolRelease(tool, nil, downloadCB); err != nil {
 						taskCB(&rpc.TaskProgress{Message: tr("Error downloading tool %s", tool)})
 						return &arduino.FailedDownloadError{Message: tr("Error downloading tool %s", tool), Cause: err}
 					}