Created configuration functions to obtain data dir and downloads dir

Author: cmaglie

arduino/cores/packagemanager/package_manager_test.go

@@ -224,7 +224,7 @@ func TestFindToolsRequiredForBoard(t *testing.T) {
 	pmb := packagemanager.NewBuilder(
 		dataDir1,
 		configuration.PackagesDir(configuration.Settings),
-		paths.New(configuration.Settings.GetString("directories.Downloads")),
+		configuration.DownloadsDir(configuration.Settings),
 		dataDir1,
 		"test",
 	)

cli/cache/clean.go

@@ -40,8 +40,8 @@ func initCleanCommand() *cobra.Command {
 func runCleanCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino-cli cache clean`")
 
-	cachePath := configuration.Settings.GetString("directories.Downloads")
-	err := os.RemoveAll(cachePath)
+	cachePath := configuration.DownloadsDir(configuration.Settings)
+	err := cachePath.RemoveAll()
 	if err != nil {
 		feedback.Errorf(tr("Error cleaning caches: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)

cli/cli.go

@@ -158,7 +158,7 @@ func preRun(cmd *cobra.Command, args []string) {
 	configFile := configuration.Settings.ConfigFileUsed()
 
 	// initialize inventory
-	err := inventory.Init(configuration.Settings.GetString("directories.Data"))
+	err := inventory.Init(configuration.DataDir(configuration.Settings).String())
 	if err != nil {
 		feedback.Errorf("Error: %v", err)
 		os.Exit(errorcodes.ErrBadArgument)

cli/core/search.go

@@ -34,7 +34,6 @@ import (
 	"github.com/arduino/arduino-cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/table"
-	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -130,7 +129,7 @@ func (sr searchResults) String() string {
 // of 24 hours is used.
 // Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 func indexesNeedUpdating(duration string) bool {
-	indexpath := paths.New(configuration.Settings.GetString("directories.Data"))
+	indexpath := configuration.DataDir(configuration.Settings)
 
 	now := time.Now()
 	modTimeThreshold, err := time.ParseDuration(duration)

cli/instance/instance.go

@@ -125,7 +125,7 @@ func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *pat
 // This ideally is only executed the first time the CLI is run.
 func FirstUpdate(instance *rpc.Instance) error {
 	// Gets the data directory to verify if library_index.json and package_index.json exist
-	dataDir := paths.New(configuration.Settings.GetString("directories.data"))
+	dataDir := configuration.DataDir(configuration.Settings)
 
 	libraryIndex := dataDir.Join("library_index.json")
 	packageIndex := dataDir.Join("package_index.json")

commands/instances.go

@@ -149,7 +149,7 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
 	instance := &CoreInstance{}
 
 	// Setup downloads directory
-	downloadsDir := paths.New(configuration.Settings.GetString("directories.Downloads"))
+	downloadsDir := configuration.DownloadsDir(configuration.Settings)
 	if downloadsDir.NotExist() {
 		err := downloadsDir.MkdirAll()
 		if err != nil {
@@ -158,7 +158,7 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
 	}
 
 	// Setup data directory
-	dataDir := paths.New(configuration.Settings.GetString("directories.Data"))
+	dataDir := configuration.DataDir(configuration.Settings)
 	packagesDir := configuration.PackagesDir(configuration.Settings)
 	if packagesDir.NotExist() {
 		err := packagesDir.MkdirAll()
@@ -497,7 +497,7 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
 		return nil, &arduino.InvalidInstanceError{}
 	}
 
-	indexpath := paths.New(configuration.Settings.GetString("directories.Data"))
+	indexpath := configuration.DataDir(configuration.Settings)
 
 	urls := []string{globals.DefaultIndexURL}
 	urls = append(urls, configuration.Settings.GetStringSlice("board_manager.additional_urls")...)

configuration/directories.go

@@ -61,12 +61,22 @@ func LibrariesDir(settings *viper.Viper) *paths.Path {
 
 // PackagesDir returns the full path to the packages folder
 func PackagesDir(settings *viper.Viper) *paths.Path {
-	return paths.New(settings.GetString("directories.Data")).Join("packages")
+	return DataDir(settings).Join("packages")
 }
 
 // ProfilesCacheDir returns the full path to the profiles cache directory
 // (it contains all the platforms and libraries used to compile a sketch
 // using profiles)
 func ProfilesCacheDir(settings *viper.Viper) *paths.Path {
-	return paths.New(settings.GetString("directories.Data")).Join("internal")
+	return DataDir(settings).Join("internal")
+}
+
+// DataDir returns the full path to the data directory
+func DataDir(settings *viper.Viper) *paths.Path {
+	return paths.New(settings.GetString("directories.Data"))
+}
+
+// DownloadsDir returns the full path to the download cache directory
+func DownloadsDir(settings *viper.Viper) *paths.Path {
+	return paths.New(settings.GetString("directories.Downloads"))
 }