Added plugin-based firmware index

arduino · Jul 13, 2023 · a3c0204 · a3c0204
1 parent 29a8d33
commit a3c0204
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/cli/common/common.go b/cli/common/common.go
@@ -63,6 +63,11 @@ func InitIndexes() (*packagemanager.PackageManager, *firmwareindex.Index) {
 	if err != nil {
 		feedback.Fatal(fmt.Sprintf("Can't load firmware index: %s", err), feedback.ErrGeneric)
 	}
+	if pluginIndex, err := indexes.GetFirmwareIndex(globals.PluginFirmwareIndexGZURL, true); err != nil {
+		feedback.Fatal(fmt.Sprintf("Can't load (plugin) firmware index: %s", err), feedback.ErrGeneric)
+	} else {
+		firmwareIndex.MergeWith(pluginIndex)
+	}
 	for _, additionalURL := range AdditionalFirmwareIndexURLs {
 		additionalIndex, err := indexes.GetFirmwareIndex(additionalURL, false)
 		if err != nil {

diff --git a/cli/globals/globals.go b/cli/globals/globals.go
@@ -27,6 +27,7 @@ import (
 var (
 	PackageIndexGZURL        = "https://downloads.arduino.cc/packages/package_index.json.gz"
 	ModuleFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/module_firmware_index.json.gz"
+	PluginFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/plugin_firmware_index.json.gz"
 	FwUploaderPath           = paths.TempDir().Join("fwuploader")
 )
 

diff --git a/indexes/download/download.go b/indexes/download/download.go
@@ -288,6 +288,8 @@ func verifyIndex(indexPath *paths.Path, URL *url.URL) error {
 		valid, err = verifyPackageIndex(indexPath, signaturePath)
 	} else if index == "module_firmware_index.json.gz" {
 		valid, err = verifyModuleFirmwareIndex(indexPath, signaturePath)
+	} else if index == "plugin_firmware_index.json.gz" {
+		valid, err = verifyModuleFirmwareIndex(indexPath, signaturePath)
 	} else {
 		return fmt.Errorf("index %s not supported", URL.Path)
 	}