use viper API

revert

format

formatting

Author: Massimiliano Pippi

arduino/cores/packagemanager/loader.go

@@ -24,25 +24,20 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/cores"
-	"github.com/arduino/arduino-cli/configs"
+	"github.com/arduino/arduino-cli/configuration"
 	"github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 	semver "go.bug.st/relaxed-semver"
 )
 
 // LoadHardware read all plaforms from the configured paths
-func (pm *PackageManager) LoadHardware(config *configs.Configuration) error {
-	dirs, err := config.HardwareDirectories()
-	if err != nil {
-		return fmt.Errorf("getting hardware directory: %s", err)
-	}
+func (pm *PackageManager) LoadHardware() error {
+	dirs := configuration.HardwareDirectories()
 	if err := pm.LoadHardwareFromDirectories(dirs); err != nil {
 		return err
 	}
-	dirs, err = config.BundleToolsDirectories()
-	if err != nil {
-		return fmt.Errorf("getting hardware directory: %s", err)
-	}
+
+	dirs = configuration.BundleToolsDirectories()
 	return pm.LoadToolsFromBundleDirectories(dirs)
 }
 

arduino/cores/packagemanager/package_manager_test.go

@@ -24,9 +24,10 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/configs"
+	"github.com/arduino/arduino-cli/configuration"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
+	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 	semver "go.bug.st/relaxed-semver"
 )
@@ -212,14 +213,15 @@ func TestBoardOptionsFunctions(t *testing.T) {
 }
 
 func TestFindToolsRequiredForBoard(t *testing.T) {
+	configuration.Init(dataDir1.String())
+	fmt.Println(viper.AllSettings())
 	pm := packagemanager.NewPackageManager(
 		dataDir1,
-		dataDir1.Join("packages"),
-		dataDir1.Join("staging"),
-		dataDir1)
-	conf := &configs.Configuration{
-		DataDir: dataDir1,
-	}
+		paths.New(viper.GetString("directories.Packages")),
+		paths.New(viper.GetString("directories.Downloads")),
+		dataDir1,
+	)
+
 	loadIndex := func(addr string) {
 		res, err := url.Parse(addr)
 		require.NoError(t, err)
@@ -228,7 +230,7 @@ func TestFindToolsRequiredForBoard(t *testing.T) {
 	loadIndex("https://dl.espressif.com/dl/package_esp32_index.json")
 	loadIndex("http://arduino.esp8266.com/stable/package_esp8266com_index.json")
 	loadIndex("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json")
-	require.NoError(t, pm.LoadHardware(conf))
+	require.NoError(t, pm.LoadHardware())
 	esp32, err := pm.FindBoardWithFQBN("esp32:esp32:esp32")
 	require.NoError(t, err)
 	esptool231 := pm.FindToolDependency(&cores.ToolDependency{

cli/cli.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/arduino/arduino-cli/cli/board"
@@ -58,6 +59,7 @@ var (
 	logFile      string
 	logFormat    string
 	outputFormat string
+	configFile   string
 )
 
 const (
@@ -87,7 +89,7 @@ func createCliCommandTree(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVar(&logFile, "log-file", "", "Path to the file where logs will be written.")
 	cmd.PersistentFlags().StringVar(&logFormat, "log-format", "text", "The output format for the logs, can be [text|json].")
 	cmd.PersistentFlags().StringVar(&outputFormat, "format", "text", "The output format, can be [text|json].")
-	cmd.PersistentFlags().StringVar(&globals.YAMLConfigFile, "config-file", "", "The custom config file (if not specified the default will be used).")
+	cmd.PersistentFlags().StringVar(&configFile, "config-file", "", "The custom config file (if not specified the default will be used).")
 	cmd.PersistentFlags().StringSliceVar(&globals.AdditionalUrls, "additional-urls", []string{}, "Additional URLs for the board manager.")
 }
 
@@ -173,7 +175,12 @@ func preRun(cmd *cobra.Command, args []string) {
 	// use the output format to configure the Feedback
 	feedback.SetFormat(format)
 
-	configuration.Init()
+	// override the config path if --config-file was passed
+	configPath := ""
+	if configFile != "" {
+		configPath = filepath.Dir(configFile)
+	}
+	configuration.Init(configPath)
 
 	logrus.Info(globals.VersionInfo.Application + "-" + globals.VersionInfo.VersionString)
 	logrus.Info("Starting root command preparation (`arduino`)")

cli/compile/compile.go

@@ -107,7 +107,7 @@ func run(cmd *cobra.Command, args []string) {
 		Quiet:           quiet,
 		VidPid:          vidPid,
 		ExportFile:      exportFile,
-	}, os.Stdout, os.Stderr, globals.Config, globals.LogLevel == "debug")
+	}, os.Stdout, os.Stderr, globals.LogLevel == "debug")
 
 	if err != nil {
 		feedback.Errorf("Error during build: %v", err)

cli/config/init.go

@@ -19,8 +19,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/arduino/arduino-cli/configuration"
-
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/sirupsen/logrus"
@@ -51,7 +49,7 @@ var initFlags struct {
 func runInitCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino config init`")
 
-	configFile := filepath.Join(configuration.GetDefaultArduinoDataDir(), "arduino-cli.yaml")
+	configFile := filepath.Join(viper.GetString("directories.Data"), "arduino-cli.yaml")
 	err := viper.WriteConfigAs(configFile)
 	if err != nil {
 		feedback.Errorf("Cannot create config file: %v", err)

cli/daemon/daemon.go

@@ -64,7 +64,6 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
 	coreServer := daemon.ArduinoCoreServerImpl{
 		DownloaderHeaders: headers,
 		VersionString:     globals.VersionInfo.VersionString,
-		Config:            globals.Config,
 	}
 	srv_commands.RegisterArduinoCoreServer(s, &coreServer)
 

cli/globals/globals.go

@@ -22,7 +22,6 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/arduino/arduino-cli/configs"
 	"github.com/arduino/arduino-cli/version"
 )
 
@@ -31,10 +30,6 @@ var (
 	Debug bool
 	// VersionInfo contains all info injected during build
 	VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
-	// Config FIXMEDOC
-	Config *configs.Configuration
-	// YAMLConfigFile contains the path to the config file
-	YAMLConfigFile string
 	// AdditionalUrls contains the list of additional urls the boards manager can use
 	AdditionalUrls []string
 	// LogLevel is temporarily exported because the compile command will

cli/instance/instance.go

@@ -11,6 +11,7 @@ import (
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 )
 
 // CreateInstaceIgnorePlatformIndexErrors creates and return an instance of the
@@ -66,17 +67,15 @@ func packageManagerInitReq() *rpc.InitReq {
 		urls = append(urls, urlString)
 	}
 
-	for _, URL := range globals.Config.BoardManagerAdditionalUrls {
-		urls = append(urls, URL.String())
+	for _, URL := range viper.GetStringSlice("board_manager.additional_urls") {
+		urls = append(urls, URL)
 	}
 
 	conf := &rpc.Configuration{}
-	conf.DataDir = globals.Config.DataDir.String()
-	conf.DownloadsDir = globals.Config.DownloadsDir().String()
+	conf.DataDir = viper.GetString("directories.Data")
+	conf.DownloadsDir = viper.GetString("directories.Downloads")
 	conf.BoardManagerAdditionalUrls = urls
-	if globals.Config.SketchbookDir != nil {
-		conf.SketchbookDir = globals.Config.SketchbookDir.String()
-	}
+	conf.SketchbookDir = viper.GetString("directories.SketchBook")
 
 	return &rpc.InitReq{Configuration: conf}
 }

commands/compile/compile.go

@@ -30,18 +30,19 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/configs"
+	"github.com/arduino/arduino-cli/configuration"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 )
 
 // Compile FIXMEDOC
-func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.Writer, config *configs.Configuration, debug bool) (*rpc.CompileResp, error) {
+func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.Writer, debug bool) (*rpc.CompileResp, error) {
 	pm := commands.GetPackageManager(req.GetInstance().GetId())
 	if pm == nil {
 		return nil, errors.New("invalid instance")
@@ -88,20 +89,11 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	builderCtx.SketchLocation = sketch.FullPath
 
 	// FIXME: This will be redundant when arduino-builder will be part of the cli
-	if packagesDir, err := config.HardwareDirectories(); err == nil {
-		builderCtx.HardwareDirs = packagesDir
-	} else {
-		return nil, fmt.Errorf("cannot get hardware directories: %s", err)
-	}
-
-	if toolsDir, err := config.BundleToolsDirectories(); err == nil {
-		builderCtx.BuiltInToolsDirs = toolsDir
-	} else {
-		return nil, fmt.Errorf("cannot get bundled tools directories: %s", err)
-	}
+	builderCtx.HardwareDirs = configuration.HardwareDirectories()
+	builderCtx.BuiltInToolsDirs = configuration.BundleToolsDirectories()
 
 	builderCtx.OtherLibrariesDirs = paths.NewPathList()
-	builderCtx.OtherLibrariesDirs.Add(config.LibrariesDir())
+	builderCtx.OtherLibrariesDirs.Add(paths.New(viper.GetString("directories.Libraries")))
 
 	if req.GetBuildPath() != "" {
 		builderCtx.BuildPath = paths.New(req.GetBuildPath())
@@ -140,7 +132,8 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	builderCtx.ArduinoAPIVersion = "10607"
 
 	// Check if Arduino IDE is installed and get it's libraries location.
-	preferencesTxt := config.DataDir.Join("preferences.txt")
+	dataDir := paths.New(viper.GetString("directories.Data"))
+	preferencesTxt := dataDir.Join("preferences.txt")
 	ideProperties, err := properties.LoadFromPath(preferencesTxt)
 	if err == nil {
 		lastIdeSubProperties := ideProperties.SubTree("last").SubTree("ide")

commands/daemon/daemon.go

@@ -31,15 +31,13 @@ import (
 	"github.com/arduino/arduino-cli/commands/core"
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/commands/upload"
-	"github.com/arduino/arduino-cli/configs"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 // ArduinoCoreServerImpl FIXMEDOC
 type ArduinoCoreServerImpl struct {
 	DownloaderHeaders http.Header
 	VersionString     string
-	Config            *configs.Configuration
 }
 
 // BoardDetails FIXMEDOC
@@ -133,7 +131,6 @@ func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoC
 		stream.Context(), req,
 		feedStream(func(data []byte) { stream.Send(&rpc.CompileResp{OutStream: data}) }),
 		feedStream(func(data []byte) { stream.Send(&rpc.CompileResp{ErrStream: data}) }),
-		s.Config,
 		false) // set debug to false
 	if err != nil {
 		return err