Initial commit

Author: giulcioffi

commands/daemon/testdata/arduino-cli.yml

@@ -2,6 +2,7 @@ board_manager:
   additional_urls:
     - http://foobar.com
     - http://example.com
+  additional_paths: []
 
 daemon:
   port: "50051"

commands/instances.go

@@ -200,9 +200,30 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexReq, downloadCB Downlo
 	}
 
 	indexpath := paths.New(configuration.Settings.GetString("directories.Data"))
+	json_paths := []string{}
+	json_paths = append(json_paths, configuration.Settings.GetStringSlice("board_manager.additional_paths")...)
+	for _, x := range json_paths {
+		//path_to_json, err := paths.New(x).Abs()
+		path_to_json := indexpath.Join(x)
+
+		if _, err := packageindex.LoadIndex(path_to_json); err != nil {
+			return nil, fmt.Errorf("invalid package index in %s: %s", path_to_json, err)
+		}
+
+		if err := indexpath.MkdirAll(); err != nil {
+			return nil, fmt.Errorf("can't create data directory %s: %s", indexpath, err)
+		}
+
+		//may not be necessary
+		//coreIndexPath := indexpath.Join(path.Base(path_to_json.Path))
+		//if err := tmp.CopyTo(coreIndexPath); err != nil {
+		//	return nil, fmt.Errorf("saving downloaded index %s: %s", path_to_json, err)
+		//}
+	}
 	urls := []string{globals.DefaultIndexURL}
 	urls = append(urls, configuration.Settings.GetStringSlice("board_manager.additional_urls")...)
 	for _, u := range urls {
+		logrus.Info("URL: %s", u)
 		URL, err := url.Parse(u)
 		if err != nil {
 			logrus.Warnf("unable to parse additional URL: %s", u)
@@ -238,7 +259,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexReq, downloadCB Downlo
 		// Check for signature
 		var tmpSig *paths.Path
 		var coreIndexSigPath *paths.Path
-		if URL.Hostname() == "downloads.arduino.cc" {
+		if URL.Hostname() == "downloads.WRONG.net" {
 			URLSig, err := url.Parse(URL.String())
 			if err != nil {
 				return nil, fmt.Errorf("parsing url for index signature check: %s", err)
@@ -649,6 +670,19 @@ func createInstance(ctx context.Context, getLibOnly bool) (*createInstanceResult
 			}
 		}
 
+		indexpath := paths.New(configuration.Settings.GetString("directories.Data"))
+		json_paths := []string{}
+		json_paths = append(json_paths, configuration.Settings.GetStringSlice("board_manager.additional_paths")...)
+		for _, x := range json_paths {
+			//path_to_json, err := paths.New(x).Abs()
+			path_to_json := indexpath.Join(x)
+
+			_, err := res.Pm.LoadPackageIndexFromFile(path_to_json)
+			if err != nil {
+				res.PlatformIndexErrors = append(res.PlatformIndexErrors, err.Error())
+			}
+		}
+
 		if err := res.Pm.LoadHardware(); err != nil {
 			return res, fmt.Errorf("error loading hardware packages: %s", err)
 		}

configuration/configuration.go

@@ -76,6 +76,7 @@ func BindFlags(cmd *cobra.Command, settings *viper.Viper) {
 	settings.BindPFlag("logging.file", cmd.Flag("log-file"))
 	settings.BindPFlag("logging.format", cmd.Flag("log-format"))
 	settings.BindPFlag("board_manager.additional_urls", cmd.Flag("additional-urls"))
+	settings.BindPFlag("board_manager.additional_paths", cmd.Flag("additional-paths"))
 }
 
 // getDefaultArduinoDataDir returns the full path to the default arduino folder

configuration/configuration_test.go

@@ -89,6 +89,7 @@ func TestInit(t *testing.T) {
 	require.Equal(t, "text", settings.GetString("logging.format"))
 
 	require.Empty(t, settings.GetStringSlice("board_manager.additional_urls"))
+	require.Empty(t, settings.GetStringSlice("board_manager.additional_paths"))
 
 	require.NotEmpty(t, settings.GetString("directories.Data"))
 	require.NotEmpty(t, settings.GetString("directories.Downloads"))

configuration/defaults.go

@@ -33,6 +33,7 @@ func SetDefaults(settings *viper.Viper) {
 
 	// Boards Manager
 	settings.SetDefault("board_manager.additional_urls", []string{})
+	settings.SetDefault("board_manager.additional_paths", []string{})
 
 	// arduino directories
 	settings.SetDefault("directories.Data", getDefaultArduinoDataDir())

docs/configuration.md

@@ -2,6 +2,7 @@
 
 - `board_manager`
   - `additional_urls` - the URLs to any additional Boards Manager package index files needed for your boards platforms.
+  - `additional_paths` - the file paths to any additional Boards Manager package index files needed for your boards platforms.
 - `daemon` - options related to running Arduino CLI as a [gRPC] server.
   - `port` - TCP port used for gRPC client connections.
 - `directories` - directories used by Arduino CLI.
@@ -66,6 +67,12 @@ Setting an additional Boards Manager URL using the `ARDUINO_BOARD_MANAGER_ADDITI
 $ export ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS=https://downloads.arduino.cc/packages/package_staging_index.json
 ```
 
+Setting an additional Boards Manager URL using the `ARDUINO_BOARD_MANAGER_ADDITIONAL_PATHS` environment variable:
+
+```sh
+$ export ARDUINO_BOARD_MANAGER_ADDITIONAL_PATHS=packages/package_staging_index.json
+```
+
 ### Configuration file
 
 [`arduino-cli config init`][arduino-cli config init] creates or updates a configuration file with the current