Create a PackageManager method to obtain the correct PlatforRelease

It may be available a bundle AVR core withing the Arduino IDE, if the
user installs a specific version (even an earlier version than the
bundled) then the installed core should be used.

Author: cmaglie

Gopkg.lock

@@ -154,16 +154,15 @@ func (platform *Platform) latestReleaseVersion() *semver.Version {
 	return max
 }
 
-// GetInstalled return one of the installed PlatformRelease
-// TODO: This is a temporary method to help incremental transition from
-// arduino-builder, it will be probably removed in the future
-func (platform *Platform) GetInstalled() *PlatformRelease {
+// GetAllInstalled returns all installed PlatformRelease
+func (platform *Platform) GetAllInstalled() []*PlatformRelease {
+	res := []*PlatformRelease{}
 	for _, release := range platform.Releases {
 		if release.InstallDir != nil {
-			return release
+			res = append(res, release)
 		}
 	}
-	return nil
+	return res
 }
 
 func (platform *Platform) String() string {

arduino/cores/cores.go

@@ -103,7 +103,7 @@ func (pm *PackageManager) IsToolRequired(toolRelease *cores.ToolRelease) bool {
 	// Search in all installed platforms
 	for _, targetPackage := range pm.packages.Packages {
 		for _, platform := range targetPackage.Platforms {
-			if platformRelease := platform.GetInstalled(); platformRelease != nil {
+			if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil {
 				if platformRelease.RequiresToolRelease(toolRelease) {
 					return true
 				}

arduino/cores/packagemanager/install_uninstall.go

@@ -90,7 +90,7 @@ func (pm *PackageManager) FindBoardsWithVidPid(vid, pid string) []*cores.Board {
 	res := []*cores.Board{}
 	for _, targetPackage := range pm.packages.Packages {
 		for _, targetPlatform := range targetPackage.Platforms {
-			if platform := targetPlatform.GetInstalled(); platform != nil {
+			if platform := pm.GetInstalledPlatformRelease(targetPlatform); platform != nil {
 				for _, board := range platform.Boards {
 					if board.HasUsbID(vid, pid) {
 						res = append(res, board)
@@ -106,7 +106,7 @@ func (pm *PackageManager) FindBoardsWithID(id string) []*cores.Board {
 	res := []*cores.Board{}
 	for _, targetPackage := range pm.packages.Packages {
 		for _, targetPlatform := range targetPackage.Platforms {
-			if platform := targetPlatform.GetInstalled(); platform != nil {
+			if platform := pm.GetInstalledPlatformRelease(targetPlatform); platform != nil {
 				for _, board := range platform.Boards {
 					if board.BoardID == id {
 						res = append(res, board)
@@ -159,7 +159,7 @@ func (pm *PackageManager) ResolveFQBN(fqbn *cores.FQBN) (
 		return targetPackage, nil, nil, nil, nil,
 			fmt.Errorf("unknown platform %s:%s", targetPackage, fqbn.PlatformArch)
 	}
-	platformRelease := platform.GetInstalled()
+	platformRelease := pm.GetInstalledPlatformRelease(platform)
 	if platformRelease == nil {
 		return targetPackage, nil, nil, nil, nil,
 			fmt.Errorf("platform %s is not installed", platformRelease)
@@ -189,7 +189,8 @@ func (pm *PackageManager) ResolveFQBN(fqbn *cores.FQBN) (
 			return targetPackage, platformRelease, board, buildProperties, nil,
 				fmt.Errorf("missing package %s:%s required for build", referredPackage, platform)
 		}
-		buildPlatformRelease = buildPackage.Platforms[fqbn.PlatformArch].GetInstalled()
+		buildPlatform := buildPackage.Platforms[fqbn.PlatformArch]
+		buildPlatformRelease = pm.GetInstalledPlatformRelease(buildPlatform)
 	}
 
 	// No errors... phew!
@@ -316,6 +317,29 @@ func (tr *ToolReleaseActions) Get() (*cores.ToolRelease, error) {
 	return tr.release, nil
 }
 
+// GetInstalledPlatformRelease returns the PlatformRelease installed (it is choosen)
+func (pm *PackageManager) GetInstalledPlatformRelease(platform *cores.Platform) *cores.PlatformRelease {
+	releases := platform.GetAllInstalled()
+	if len(releases) == 0 {
+		return nil
+	}
+	best := releases[0]
+	bestIsManaged := pm.IsManagedPlatformRelease(best)
+	for _, candidate := range releases[1:] {
+		candidateIsManaged := pm.IsManagedPlatformRelease(candidate)
+		if bestIsManaged == candidateIsManaged {
+			if candidate.Version.GreaterThan(best.Version) {
+				best = candidate
+			}
+		}
+		if !bestIsManaged && candidateIsManaged {
+			best = candidate
+			bestIsManaged = true
+		}
+	}
+	return best
+}
+
 func (pm *PackageManager) GetAllInstalledToolsReleases() []*cores.ToolRelease {
 	tools := []*cores.ToolRelease{}
 	for _, targetPackage := range pm.packages.Packages {

arduino/cores/packagemanager/package_manager.go

@@ -45,7 +45,7 @@ func runListAllCommand(cmd *cobra.Command, args []string) {
 	list := &output.BoardList{}
 	for _, targetPackage := range pm.GetPackages().Packages {
 		for _, platform := range targetPackage.Platforms {
-			platformRelease := platform.GetInstalled()
+			platformRelease := pm.GetInstalledPlatformRelease(platform)
 			if platformRelease == nil {
 				continue
 			}

commands/board/listall.go

@@ -113,7 +113,7 @@ func InitLibraryManager(pm *packagemanager.PackageManager) *librariesmanager.Lib
 	if pm != nil {
 		for _, targetPackage := range pm.GetPackages().Packages {
 			for _, platform := range targetPackage.Platforms {
-				if platformRelease := platform.GetInstalled(); platformRelease != nil {
+				if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil {
 					lm.AddPlatformReleaseLibrariesDir(platformRelease, libraries.PlatformBuiltIn)
 				}
 			}

commands/commands.go

@@ -137,7 +137,7 @@ func run(cmd *cobra.Command, args []string) {
 		Package:              packageName,
 		PlatformArchitecture: coreName,
 	})
-	if targetPlatform == nil || targetPlatform.GetInstalled() == nil {
+	if targetPlatform == nil || pm.GetInstalledPlatformRelease(targetPlatform) == nil {
 		errorMessage := fmt.Sprintf(
 			"\"%[1]s:%[2]s\" platform is not installed, please install it by running \""+
 				commands.AppName+" core install %[1]s:%[2]s\".", packageName, coreName)
@@ -146,7 +146,7 @@ func run(cmd *cobra.Command, args []string) {
 	}
 
 	ctx := &types.Context{}
-
+	ctx.PackageManager = pm
 	if parsedFqbn, err := cores.ParseFQBN(fqbn); err != nil {
 		formatter.PrintError(err, "Error parsing FQBN.")
 		os.Exit(commands.ErrBadArgument)

commands/compile/compile.go

@@ -78,7 +78,7 @@ func installPlatformRelease(pm *packagemanager.PackageManager, platformRelease *
 	log := pm.Log.WithField("platform", platformRelease)
 
 	platform := platformRelease.Platform
-	installed := platform.GetInstalled()
+	installed := pm.GetInstalledPlatformRelease(platform)
 	if installed == nil {
 		log.Info("Installing platform")
 		formatter.Print("Installing " + platformRelease.String() + "...")

commands/core/install.go

@@ -50,7 +50,7 @@ func runListCommand(cmd *cobra.Command, args []string) {
 	res := output.InstalledPlatformReleases{}
 	for _, targetPackage := range pm.GetPackages().Packages {
 		for _, platform := range targetPackage.Platforms {
-			if platformRelease := platform.GetInstalled(); platformRelease != nil {
+			if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil {
 				if listFlags.updatableOnly {
 					if latest := platform.GetLatestRelease(); latest == nil || latest == platformRelease {
 						continue

commands/core/list.go

@@ -59,7 +59,7 @@ func uninstallPlatformByRef(pm *packagemanager.PackageManager, platformRef *pack
 			formatter.PrintErrorMessage("Platform not found " + platformRef.String())
 			os.Exit(commands.ErrBadCall)
 		}
-		platformRelease := platform.GetInstalled()
+		platformRelease := pm.GetInstalledPlatformRelease(platform)
 		if platformRelease == nil {
 			formatter.PrintErrorMessage("Platform not installed " + platformRef.String())
 			os.Exit(commands.ErrBadCall)