Skip to content

Commit e82a46d

Browse files
committed
Simplify function pm.DownloadPlatformRelease
1 parent 803782c commit e82a46d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arduino/cores/packagemanager/download.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ func (pm *PackageManager) DownloadToolRelease(tool *cores.ToolRelease, config *d
128128

129129
// DownloadPlatformRelease downloads a PlatformRelease. If the platform is already downloaded a
130130
// nil Downloader is returned.
131-
func (pm *PackageManager) DownloadPlatformRelease(platform *cores.PlatformRelease, config *downloader.Config, label string, progressCB rpc.DownloadProgressCB) error {
132-
return platform.Resource.Download(pm.DownloadDir, config, label, progressCB)
131+
func (pm *PackageManager) DownloadPlatformRelease(platform *cores.PlatformRelease, config *downloader.Config, progressCB rpc.DownloadProgressCB) error {
132+
return platform.Resource.Download(pm.DownloadDir, config, platform.String(), progressCB)
133133
}

commands/core/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.
7171
if err != nil {
7272
return &arduino.FailedDownloadError{Message: tr("Error downloading platform %s", platformRelease), Cause: err}
7373
}
74-
return pm.DownloadPlatformRelease(platformRelease, config, platformRelease.String(), downloadCB)
74+
return pm.DownloadPlatformRelease(platformRelease, config, downloadCB)
7575
}
7676

7777
func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, downloadCB rpc.DownloadProgressCB) error {

commands/instances.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeRequest, downloadCB rpc.Downlo
688688
}
689689

690690
// Downloads platform
691-
if err := pm.DownloadPlatformRelease(latest, downloaderConfig, latest.String(), downloadCB); err != nil {
691+
if err := pm.DownloadPlatformRelease(latest, downloaderConfig, downloadCB); err != nil {
692692
return &arduino.FailedDownloadError{Message: tr("Error downloading platform %s", latest), Cause: err}
693693
}
694694

0 commit comments

Comments
 (0)