cleanup firmwareindex pkg

Author: alessio-perugini

cli/common/common.go

@@ -93,11 +93,6 @@ func GetBoard(firmwareIndex *firmwareindex.Index, fqbn string) *firmwareindex.In
 // DownloadRequiredToolsForBoard is an helper function that downloads the correct tool to flash a board,
 // it returns the path of the downloaded tool
 func DownloadRequiredToolsForBoard(pm *packagemanager.PackageManager, board *firmwareindex.IndexBoard) *paths.Path {
-	if !board.IsPlugin() {
-		// Just download the upload tool for integrated uploaders
-		return downloadTool(pm, board.Uploader)
-	}
-
 	// Download the plugin
 	toolDir := downloadTool(pm, board.UploaderPlugin)
 

indexes/firmwareindex/firmwareindex.go

@@ -21,7 +21,6 @@ package firmwareindex
 import (
 	"encoding/json"
 	"fmt"
-	"runtime"
 
 	"github.com/arduino/arduino-cli/arduino/security"
 	"github.com/arduino/arduino-fwuploader/cli/globals"
@@ -39,22 +38,12 @@ type Index struct {
 
 // IndexBoard represents a single entry from module_firmware_index.json file.
 type IndexBoard struct {
-	Fqbn      string           `json:"fqbn"`
-	Firmwares []*IndexFirmware `json:"firmware"`
-	Module    string           `json:"module"`
-	Name      string           `json:"name"`
-
-	// Fields required for integrated uploaders (deprecated)
-	LoaderSketch    *IndexSketch          `json:"loader_sketch"`
-	VersionSketch   *IndexSketch          `json:"version_sketch"`
-	Uploader        string                `json:"uploader"`
-	UploadTouch     bool                  `json:"upload.use_1200bps_touch"`
-	UploadWait      bool                  `json:"upload.wait_for_upload_port"`
-	UploaderCommand *IndexUploaderCommand `json:"uploader.command"`
-
-	// Fields required for plugin uploaders
-	UploaderPlugin  string   `json:"uploader_plugin"`
-	AdditionalTools []string `json:"additional_tools"`
+	Fqbn            string           `json:"fqbn"`
+	Firmwares       []*IndexFirmware `json:"firmware"`
+	Module          string           `json:"module"`
+	Name            string           `json:"name"`
+	UploaderPlugin  string           `json:"uploader_plugin"`
+	AdditionalTools []string         `json:"additional_tools"`
 }
 
 // IndexUploaderCommand represents the command-line to use for different OS
@@ -167,17 +156,6 @@ func (b *IndexBoard) GetFirmware(version string) *IndexFirmware {
 	return nil
 }
 
-// GetUploaderCommand returns the command to use for the upload
-func (b *IndexBoard) GetUploaderCommand() string {
-	if runtime.GOOS == "windows" && b.UploaderCommand.Windows != "" {
-		return b.UploaderCommand.Linux
-	} else if runtime.GOOS == "darwin" && b.UploaderCommand.Macosx != "" {
-		return b.UploaderCommand.Macosx
-	}
-	// The linux uploader command is considere to be the generic one
-	return b.UploaderCommand.Linux
-}
-
 // LatestFirmware returns the latest firmware version for the IndexBoard
 func (b *IndexBoard) LatestFirmware() *IndexFirmware {
 	var latest *IndexFirmware
@@ -188,8 +166,3 @@ func (b *IndexBoard) LatestFirmware() *IndexFirmware {
 	}
 	return latest
 }
-
-// IsPlugin returns true if the IndexBoard uses the plugin system
-func (b *IndexBoard) IsPlugin() bool {
-	return b.UploaderPlugin != ""
-}

indexes/firmwareindex/firmwareindex_test.go

@@ -26,7 +26,7 @@ import (
 )
 
 func TestIndexParsing(t *testing.T) {
-	indexFile := paths.New("testdata/module_firmware_index.json")
+	indexFile := paths.New("testdata/plugin_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
@@ -38,15 +38,15 @@ func TestIndexParsing(t *testing.T) {
 }
 
 func TestGetBoard(t *testing.T) {
-	indexFile := paths.New("testdata/module_firmware_index.json")
+	indexFile := paths.New("testdata/plugin_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
 	require.NotEmpty(t, index)
 
-	board := index.GetBoard("arduino:samd:mkr1000")
+	board := index.GetBoard("arduino:samd:mkrwifi1010")
 	require.NotNil(t, board)
-	require.Equal(t, board.Fqbn, "arduino:samd:mkr1000")
+	require.Equal(t, board.Fqbn, "arduino:samd:mkrwifi1010")
 
 	board = index.GetBoard("arduino:samd:nano_33_iot")
 	require.NotNil(t, board)
@@ -57,29 +57,29 @@ func TestGetBoard(t *testing.T) {
 }
 
 func TestGetLatestFirmware(t *testing.T) {
-	indexFile := paths.New("testdata/module_firmware_index.json")
+	indexFile := paths.New("testdata/plugin_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
 	require.NotEmpty(t, index)
 
-	firmware := index.GetBoard("arduino:samd:mkr1000").LatestFirmware()
-	require.Equal(t, firmware.Version.String(), "19.6.1")
+	firmware := index.GetBoard("arduino:samd:mkrwifi1010").LatestFirmware()
+	require.Equal(t, firmware.Version.String(), "1.5.0")
 }
 
 func TestGetFirmware(t *testing.T) {
-	indexFile := paths.New("testdata/module_firmware_index.json")
+	indexFile := paths.New("testdata/plugin_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
 	require.NotEmpty(t, index)
 
-	firmware := index.GetBoard("arduino:samd:mkr1000").GetFirmware("19.6.1")
-	require.Equal(t, firmware.Version.String(), "19.6.1")
+	firmware := index.GetBoard("arduino:samd:mkrwifi1010").GetFirmware("1.5.0")
+	require.Equal(t, firmware.Version.String(), "1.5.0")
 
-	firmware = index.GetBoard("arduino:samd:mkr1000").GetFirmware("19.5.2")
-	require.Equal(t, firmware.Version.String(), "19.5.2")
+	firmware = index.GetBoard("arduino:samd:mkrwifi1010").GetFirmware("1.4.8")
+	require.Equal(t, firmware.Version.String(), "1.4.8")
 
-	firmware = index.GetBoard("arduino:samd:mkr1000").GetFirmware("0.0.0")
+	firmware = index.GetBoard("arduino:samd:mkrwifi1010").GetFirmware("0.0.0")
 	require.Nil(t, firmware)
 }