Fixed Explorer.IsManagedPlatformRelease

It has been replaced by a much simpler check on the version field.

Author: cmaglie

internal/arduino/cores/cores.go

@@ -117,6 +117,11 @@ func (t *TimestampsStore) Dirty() bool {
 	return false
 }
 
+// IsManaged returns true if the platform release is managed by the package manager.
+func (release *PlatformRelease) IsManaged() bool {
+	return release.Version.String() != ""
+}
+
 // Dirty returns true if one of the files of this PlatformRelease has been changed
 // (it means that the PlatformRelease should be rebuilt to be used correctly).
 func (release *PlatformRelease) Dirty() bool {

internal/arduino/cores/packagemanager/install_uninstall.go

@@ -259,23 +259,6 @@ func (pme *Explorer) RunPreOrPostScript(installDir *paths.Path, prefix string) (
 	return []byte{}, []byte{}, nil
 }
 
-// IsManagedPlatformRelease returns true if the PlatforRelease is managed by the PackageManager
-func (pme *Explorer) IsManagedPlatformRelease(platformRelease *cores.PlatformRelease) bool {
-	if pme.PackagesDir == nil {
-		return false
-	}
-	installDir := platformRelease.InstallDir.Clone()
-	if installDir.FollowSymLink() != nil {
-		return false
-	}
-	packagesDir := pme.PackagesDir.Clone()
-	if packagesDir.FollowSymLink() != nil {
-		return false
-	}
-	managed, _ := installDir.IsInsideDir(packagesDir)
-	return managed
-}
-
 // UninstallPlatform remove a PlatformRelease.
 func (pme *Explorer) UninstallPlatform(platformRelease *cores.PlatformRelease, taskCB rpc.TaskProgressCB, skipPreUninstall bool) error {
 	log := pme.log.WithField("platform", platformRelease)
@@ -290,7 +273,7 @@ func (pme *Explorer) UninstallPlatform(platformRelease *cores.PlatformRelease, t
 	}
 
 	// Safety measure
-	if !pme.IsManagedPlatformRelease(platformRelease) {
+	if !platformRelease.IsManaged() {
 		err := errors.New(i18n.Tr("%s is not managed by package manager", platformRelease))
 		log.WithError(err).Error("Error uninstalling")
 		return &cmderrors.FailedUninstallError{Message: err.Error()}

internal/arduino/cores/packagemanager/package_manager.go

@@ -608,7 +608,7 @@ func (tr *ToolReleaseActions) Get() (*cores.ToolRelease, error) {
 // or nil if the PlatformRelease is not installed. Platforms installed manually are ignored.
 func (pme *Explorer) GetInstalledPlatformRelease(platform *cores.Platform) *cores.PlatformRelease {
 	for _, release := range platform.GetAllInstalled() {
-		if release.IsInstalled() && pme.IsManagedPlatformRelease(release) {
+		if release.IsInstalled() && release.IsManaged() {
 			return release
 		}
 	}
@@ -625,33 +625,24 @@ func (pme *Explorer) GetBestInstalledPlatformRelease(platform *cores.Platform) *
 
 	debug := func(msg string, pl *cores.PlatformRelease) {
 		pme.log.WithField("version", pl.Version).
-			WithField("managed", pme.IsManagedPlatformRelease(pl)).
+			WithField("managed", pl.IsManaged()).
 			Debugf("%s: %s", msg, pl)
 	}
 
 	best := releases[0]
-	bestIsManaged := pme.IsManagedPlatformRelease(best)
-	debug("current best", best)
-
 	for _, candidate := range releases[1:] {
-		candidateIsManaged := pme.IsManagedPlatformRelease(candidate)
+		debug("current best", best)
 		debug("candidate", candidate)
-		if !candidateIsManaged && !bestIsManaged {
-			if candidate.Version.GreaterThan(best.Version) {
-				best = candidate
-			}
+		if candidate.IsManaged() && !best.IsManaged() {
 			continue
 		}
-		if !candidateIsManaged {
+		if !candidate.IsManaged() && best.IsManaged() {
+			best = candidate
 			continue
 		}
-		if !bestIsManaged {
-			best = candidate
-			bestIsManaged = true
-		} else if candidate.Version.GreaterThan(best.Version) {
+		if candidate.Version.GreaterThan(best.Version) {
 			best = candidate
 		}
-		debug("current best", best)
 	}
 	return best
 }