make packages and platform case insensitive pt 3

using the `core.PlatformSearch()` approach but using only a small portion of the logic

Author: umbynos

cli/arguments/reference.go

@@ -18,6 +18,10 @@ package arguments
 import (
 	"fmt"
 	"strings"
+
+	"github.com/arduino/arduino-cli/arduino/cores"
+	"github.com/arduino/arduino-cli/commands"
+	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 )
 
 // Reference represents a reference item (core or library) passed to the CLI
@@ -37,10 +41,10 @@ func (r *Reference) String() string {
 
 // ParseReferences is a convenient wrapper that operates on a slice of strings and
 // calls ParseReference for each of them. It returns at the first invalid argument.
-func ParseReferences(args []string) ([]*Reference, error) {
+func ParseReferences(args []string, inst *rpc.Instance) ([]*Reference, error) {
 	ret := []*Reference{}
 	for _, arg := range args {
-		reference, err := ParseReference(arg)
+		reference, err := ParseReference(arg, inst)
 		if err != nil {
 			return nil, err
 		}
@@ -50,7 +54,7 @@ func ParseReferences(args []string) ([]*Reference, error) {
 }
 
 // ParseReference parses a string and returns a Reference object.
-func ParseReference(arg string) (*Reference, error) {
+func ParseReference(arg string, inst *rpc.Instance) (*Reference, error) {
 	ret := &Reference{}
 	if arg == "" {
 		return nil, fmt.Errorf(tr("invalid empty core argument"))
@@ -75,10 +79,31 @@ func ParseReference(arg string) (*Reference, error) {
 		return nil, fmt.Errorf(tr("invalid empty core name '%s'"), arg)
 	}
 	ret.PackageName = toks[0]
+
+	// try to search in the packages, this way ParseReference can be case insensitive
+	// note that if the search fail for some reason the ret.Packagename does not get overwritten
+	var targetPackage *cores.Package
+	if inst != nil { // do not perform the search if the instance is not defined
+		pm := commands.GetPackageManager(inst.Id)
+		for _, targetPackage = range pm.Packages {
+			if targetPackage.Name == strings.ToLower(ret.PackageName) {
+				ret.PackageName = targetPackage.Name
+				break
+			}
+		}
+	}
 	if toks[1] == "" {
 		return nil, fmt.Errorf(tr("invalid empty core architecture '%s'"), arg)
 	}
 	ret.Architecture = toks[1]
-
+	// we do the same for architecture
+	if inst != nil { // do not perform the search if the instance is not defined
+		for _, platform := range targetPackage.Platforms {
+			if platform.Architecture == strings.ToLower(ret.Architecture) {
+				ret.Architecture = platform.Architecture
+				break
+			}
+		}
+	}
 	return ret, nil
 }

cli/arguments/reference_test.go

@@ -53,13 +53,13 @@ func TestArgsStringify(t *testing.T) {
 
 func TestParseReferenceCores(t *testing.T) {
 	for _, tt := range goodCores {
-		actual, err := arguments.ParseReference(tt.in)
+		actual, err := arguments.ParseReference(tt.in, nil)
 		assert.Nil(t, err)
 		assert.Equal(t, tt.expected, actual)
 	}
 
 	for _, tt := range badCores {
-		actual, err := arguments.ParseReference(tt.in)
+		actual, err := arguments.ParseReference(tt.in, nil)
 		require.NotNil(t, err, "Testing bad core '%s'", tt.in)
 		require.Equal(t, tt.expected, actual, "Testing bad core '%s'", tt.in)
 	}
@@ -71,7 +71,7 @@ func TestParseArgs(t *testing.T) {
 		input = append(input, tt.in)
 	}
 
-	refs, err := arguments.ParseReferences(input)
+	refs, err := arguments.ParseReferences(input, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, len(goodCores), len(refs))
 

cli/core/download.go

@@ -53,7 +53,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
 
 	logrus.Info("Executing `arduino-cli core download`")
 
-	platformsRefs, err := arguments.ParseReferences(args)
+	platformsRefs, err := arguments.ParseReferences(args, inst)
 	if err != nil {
 		feedback.Errorf(tr("Invalid argument passed: %v"), err)
 		os.Exit(errorcodes.ErrBadArgument)

cli/core/install.go

@@ -61,7 +61,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 	inst := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli core install`")
 
-	platformsRefs, err := arguments.ParseReferences(args)
+	platformsRefs, err := arguments.ParseReferences(args, inst)
 	if err != nil {
 		feedback.Errorf(tr("Invalid argument passed: %v"), err)
 		os.Exit(errorcodes.ErrBadArgument)

cli/core/uninstall.go

@@ -50,7 +50,7 @@ func runUninstallCommand(cmd *cobra.Command, args []string) {
 	inst := instance.CreateAndInit()
 	logrus.Info("Executing `arduino-cli core uninstall`")
 
-	platformsRefs, err := arguments.ParseReferences(args)
+	platformsRefs, err := arguments.ParseReferences(args, inst)
 	if err != nil {
 		feedback.Errorf(tr("Invalid argument passed: %v"), err)
 		os.Exit(errorcodes.ErrBadArgument)

cli/core/upgrade.go

@@ -76,7 +76,7 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
 
 	// proceed upgrading, if anything is upgradable
 	exitErr := false
-	platformsRefs, err := arguments.ParseReferences(args)
+	platformsRefs, err := arguments.ParseReferences(args, inst)
 	if err != nil {
 		feedback.Errorf(tr("Invalid argument passed: %v"), err)
 		os.Exit(errorcodes.ErrBadArgument)