Added DownloadsDir configuration and env var

Author: cmaglie

commands/commands_test.go

@@ -26,11 +26,11 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-cli/commands/root"
-	"github.com/arduino/go-paths-helper"
+	paths "github.com/arduino/go-paths-helper"
 	"github.com/bouk/monkey"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.bug.st/relaxed-semver"
+	semver "go.bug.st/relaxed-semver"
 )
 
 // Redirecting stdOut so we can analyze output line by
@@ -110,11 +110,28 @@ func executeWithArgs(t *testing.T, args ...string) (int, []byte) {
 	return exitCode, output
 }
 
+var currDownloadDir *paths.Path
+
+func useSharedDownloadDir(t *testing.T) func() {
+	tmp := paths.TempDir().Join("arduino-cli-test-staging")
+	err := tmp.MkdirAll()
+	require.NoError(t, err, "making shared staging dir")
+	os.Setenv("ARDUINO_DOWNLOADS_DIR", tmp.String())
+	currDownloadDir = tmp
+	fmt.Printf("ARDUINO_DOWNLOADS_DIR = %s\n", os.Getenv("ARDUINO_DOWNLOADS_DIR"))
+
+	return func() {
+		os.Unsetenv("ARDUINO_DOWNLOADS_DIR")
+		currDownloadDir = nil
+		fmt.Printf("ARDUINO_DOWNLOADS_DIR = %s\n", os.Getenv("ARDUINO_DOWNLOADS_DIR"))
+	}
+}
+
 var currDataDir *paths.Path
 
 func makeTempDataDir(t *testing.T) func() {
 	tmp, err := paths.MkTempDir("", "test")
-	require.NoError(t, err, "making temporary staging dir")
+	require.NoError(t, err, "making temporary data dir")
 	os.Setenv("ARDUINO_DATA_DIR", tmp.String())
 	currDataDir = tmp
 	fmt.Printf("ARDUINO_DATA_DIR = %s\n", os.Getenv("ARDUINO_DATA_DIR"))

configs/configuration.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/arduino/go-paths-helper"
+	paths "github.com/arduino/go-paths-helper"
 )
 
 // Configuration contains a running configuration
@@ -39,6 +39,10 @@ type Configuration struct {
 	// ArduinoIDEDirectory is the directory of the Arduino IDE if the CLI runs together with it.
 	ArduinoIDEDirectory *paths.Path
 
+	// downloadsDir is the directory where the package files are downloaded and cached.
+	// Use DownloadsDir() method to retrieve it.
+	downloadsDir *paths.Path
+
 	// IDEBundledCheckResult contains the result of the check to see if the CLI is bundled with the IDE:
 	// the field is true if the CLI is bundled with the Arduino IDE, false if the CLI is running
 	// standalone or nil if the detection has not been performed.
@@ -94,6 +98,9 @@ func (config *Configuration) PackagesDir() *paths.Path {
 
 // DownloadsDir returns the directory for archive downloads.
 func (config *Configuration) DownloadsDir() *paths.Path {
+	if config.downloadsDir != nil {
+		return config.downloadsDir
+	}
 	return config.DataDir.Join("staging")
 }
 

configs/env_vars_serializer.go

@@ -34,4 +34,7 @@ func (config *Configuration) LoadFromEnv() {
 	if dir, has := os.LookupEnv("ARDUINO_DATA_DIR"); has {
 		config.DataDir = paths.New(dir)
 	}
+	if dir, has := os.LookupEnv("ARDUINO_DOWNLOADS_DIR"); has {
+		config.downloadsDir = paths.New(dir)
+	}
 }

configs/yaml_serializer.go

@@ -28,11 +28,12 @@ import (
 )
 
 type yamlConfig struct {
-	ProxyType         string                   `yaml:"proxy_type"`
-	ProxyManualConfig *yamlProxyConfig         `yaml:"manual_configs,omitempty"`
-	SketchbookPath    string                   `yaml:"sketchbook_path,omitempty"`
-	ArduinoDataDir    string                   `yaml:"arduino_data,omitempty"`
-	BoardsManager     *yamlBoardsManagerConfig `yaml:"board_manager"`
+	ProxyType           string                   `yaml:"proxy_type"`
+	ProxyManualConfig   *yamlProxyConfig         `yaml:"manual_configs,omitempty"`
+	SketchbookPath      string                   `yaml:"sketchbook_path,omitempty"`
+	ArduinoDataDir      string                   `yaml:"arduino_data,omitempty"`
+	ArduinoDownloadsDir string                   `yaml:"arduino_downloads_dir,omitempty"`
+	BoardsManager       *yamlBoardsManagerConfig `yaml:"board_manager"`
 }
 
 type yamlBoardsManagerConfig struct {
@@ -66,6 +67,11 @@ func (config *Configuration) LoadFromYAML(path *paths.Path) error {
 	if ret.SketchbookPath != "" {
 		config.SketchbookDir = paths.New(ret.SketchbookPath)
 	}
+	if ret.ArduinoDownloadsDir != "" {
+		config.downloadsDir = paths.New(ret.ArduinoDownloadsDir)
+	} else {
+		config.downloadsDir = nil
+	}
 	if ret.ProxyType != "" {
 		config.ProxyType = ret.ProxyType
 		if ret.ProxyManualConfig != nil {
@@ -96,6 +102,9 @@ func (config *Configuration) SerializeToYAML() ([]byte, error) {
 	if config.DataDir != nil {
 		c.ArduinoDataDir = config.DataDir.String()
 	}
+	if config.downloadsDir != nil {
+		c.ArduinoDownloadsDir = config.downloadsDir.String()
+	}
 	c.ProxyType = config.ProxyType
 	if config.ProxyType == "manual" {
 		c.ProxyManualConfig = &yamlProxyConfig{