commands:upload Move function to search board by fqbn in packagemanager

Signed-off-by: Matteo Suppo <matteo.suppo@gmail.com>

Author: matteosuppo

commands/upload/upload.go

@@ -102,9 +102,6 @@ func run(command *cobra.Command, args []string) {
 		formatter.PrintErrorMessage("Fully Qualified Board Name has incorrect format.")
 		os.Exit(commands.ErrBadCall)
 	}
-	packageName := fqbnParts[0]
-	coreName := fqbnParts[1]
-	boardName := fqbnParts[2]
 
 	pm := commands.InitPackageManager()
 	if err := pm.LoadHardware(); err != nil {
@@ -113,25 +110,9 @@ func run(command *cobra.Command, args []string) {
 	}
 
 	// Find target board
-	// TODO: Make a packagemanager function to do this
-	targetPackage := pm.GetPackages().Packages[packageName]
-	if targetPackage == nil {
-		formatter.PrintErrorMessage("Unknown package " + packageName + ".")
-		os.Exit(commands.ErrBadCall)
-	}
-	platform := targetPackage.Platforms[coreName]
-	if platform == nil {
-		formatter.PrintErrorMessage("Unknown platform " + packageName + ":" + coreName + ".")
-		os.Exit(commands.ErrBadCall)
-	}
-	platformRelease := platform.GetInstalled()
-	if platformRelease == nil {
-		formatter.PrintErrorMessage("Platform " + packageName + ":" + coreName + " is not installed.")
-		os.Exit(commands.ErrBadCall)
-	}
-	board := platformRelease.Boards[boardName]
-	if board == nil {
-		formatter.PrintErrorMessage("Unknown board " + packageName + ":" + coreName + ":" + boardName + ".")
+	board, err := pm.FindBoardWithFQBN(fqbn)
+	if err != nil {
+		formatter.PrintError(err, "Invalid FQBN.")
 		os.Exit(commands.ErrBadCall)
 	}
 
@@ -160,7 +141,7 @@ func run(command *cobra.Command, args []string) {
 	var referencedPlatformRelease *cores.PlatformRelease
 	var uploadTool *cores.Tool
 	if split := strings.Split(uploadToolID, ":"); len(split) == 1 {
-		uploadTool = targetPackage.Tools[uploadToolID]
+		uploadTool = board.PlatformRelease.Platform.Package.Tools[uploadToolID]
 	} else if len(split) == 2 {
 		referencedPackage = pm.GetPackages().Packages[split[0]]
 		if referencedPackage == nil {
@@ -169,7 +150,7 @@ func run(command *cobra.Command, args []string) {
 		}
 		uploadTool = referencedPackage.Tools[split[1]]
 
-		referencedPlatform = referencedPackage.Platforms[coreName]
+		referencedPlatform = referencedPackage.Platforms[board.PlatformRelease.Platform.Architecture]
 		if referencedPlatform != nil {
 			referencedPlatformRelease = referencedPlatform.GetInstalled()
 		}
@@ -193,8 +174,8 @@ func run(command *cobra.Command, args []string) {
 	if referencedPlatformRelease != nil {
 		uploadProperties.Merge(referencedPlatformRelease.Properties)
 	}
-	uploadProperties.Merge(platformRelease.Properties)
-	uploadProperties.Merge(platformRelease.RuntimeProperties())
+	uploadProperties.Merge(board.PlatformRelease.Properties)
+	uploadProperties.Merge(board.PlatformRelease.RuntimeProperties())
 	uploadProperties.Merge(boardProperties)
 
 	uploadToolProperties := uploadProperties.SubTree("tools." + uploadTool.Name)

cores/packagemanager/package_manager.go

@@ -30,12 +30,13 @@
 package packagemanager
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
-
-	"github.com/bcmi-labs/arduino-cli/configs"
+	"strings"
 
 	"github.com/bcmi-labs/arduino-cli/common/releases"
+	"github.com/bcmi-labs/arduino-cli/configs"
 	"github.com/bcmi-labs/arduino-cli/cores"
 	"github.com/bcmi-labs/arduino-cli/cores/packageindex"
 	"github.com/sirupsen/logrus"
@@ -117,6 +118,42 @@ func (pm *PackageManager) FindBoardsWithID(id string) []*cores.Board {
 	return res
 }
 
+// FindBoardWithFQBN returns the board identified by the fqbn, or an error
+func (pm *PackageManager) FindBoardWithFQBN(fqbn string) (*cores.Board, error) {
+	// Split fqbn
+	fqbnParts := strings.Split(fqbn, ":")
+	if len(fqbnParts) < 3 || len(fqbnParts) > 4 {
+		return nil, errors.New("incorrect format for fqbn")
+	}
+	packageName := fqbnParts[0]
+	platformArch := fqbnParts[1]
+	boardID := fqbnParts[2]
+
+	// Search for the board
+	for _, targetPackage := range pm.packages.Packages {
+		fmt.Println(targetPackage.Name, packageName)
+		if targetPackage.Name != packageName {
+			continue
+		}
+		for _, targetPlatform := range targetPackage.Platforms {
+			if targetPlatform.Architecture != platformArch {
+				continue
+			}
+
+			platform := targetPlatform.GetInstalled()
+			if platform == nil {
+				return nil, errors.New("platform not installed")
+			}
+			for _, board := range platform.Boards {
+				if board.BoardId == boardID {
+					return board, nil
+				}
+			}
+		}
+	}
+	return nil, errors.New("board not found")
+}
+
 // FIXME add an handler to be invoked on each verbose operation, in order to let commands display results through the formatter
 // as for the progress bars during download
 func (pm *PackageManager) RegisterEventHandler(eventHandler EventHandler) {

cores/packagemanager/package_manager_test.go

@@ -0,0 +1,23 @@
+package packagemanager_test
+
+import (
+	"testing"
+
+	"github.com/bcmi-labs/arduino-cli/cores/packagemanager"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFindBoardWithFQBN(t *testing.T) {
+	pm := packagemanager.NewPackageManager()
+	pm.LoadHardwareFromDirectory("testdata")
+
+	board, err := pm.FindBoardWithFQBN("arduino:avr:uno")
+	require.Nil(t, err)
+	require.NotNil(t, board)
+	require.Equal(t, board.Name(), "Arduino/Genuino Uno")
+
+	board, err = pm.FindBoardWithFQBN("arduino:avr:mega")
+	require.Nil(t, err)
+	require.NotNil(t, board)
+	require.Equal(t, board.Name(), "Arduino/Genuino Mega or Mega 2560")
+}