configs: moved Arduino-IDE related methods to dedicated file

Author: cmaglie

configs/arduino_ide.go

@@ -0,0 +1,94 @@
+/*
+ * This file is part of arduino-cli.
+ *
+ * arduino-cli is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2018 ARDUINO AG (http://www.arduino.cc/)
+ */
+
+package configs
+
+import (
+	"errors"
+	"path/filepath"
+
+	"github.com/arduino/go-properties-map"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+)
+
+// UnserializeFromIDEPreferences loads the config from an IDE
+// preferences.txt file, by Updating the specified otherConfigs
+func UnserializeFromIDEPreferences(otherConfigs *Configs) error {
+	logrus.Info("Unserializing from IDE preferences")
+	props, err := properties.Load(filepath.Join(otherConfigs.ArduinoDataFolder, "preferences.txt"))
+	if err != nil {
+		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
+		return err
+	}
+	err = proxyConfigsFromIDEPrefs(otherConfigs, props)
+	if err != nil {
+		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
+		return err
+	}
+	sketchbookPath, exists := props.SubTree("sketchbook")["path"]
+	if exists {
+		otherConfigs.SketchbookPath = sketchbookPath
+	}
+	return nil
+}
+
+func proxyConfigsFromIDEPrefs(otherConfigs *Configs, props properties.Map) error {
+	proxy := props.SubTree("proxy")
+	switch proxy["type"] {
+	case "auto":
+		// Automatic proxy
+		viper.Set("proxy.type", "auto")
+		break
+	case "manual":
+		// Manual proxy configuration
+		manualConfig := proxy.SubTree("manual")
+		hostname, exists := manualConfig["hostname"]
+		if !exists {
+			return errors.New("Proxy hostname not found in preferences.txt")
+		}
+		username := manualConfig["username"]
+		password := manualConfig["password"]
+
+		otherConfigs.ProxyType = "manual"
+		otherConfigs.ProxyManualConfig = &ProxyConfigs{
+			Hostname: hostname,
+			Username: username,
+			Password: password,
+		}
+		viper.Set("proxy", otherConfigs.ProxyManualConfig)
+		break
+	case "none":
+		// No proxy
+		break
+	default:
+		return errors.New("Unsupported proxy config")
+	}
+	return nil
+}

configs/configs.go

@@ -34,7 +34,6 @@
 package configs
 
 import (
-	"errors"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -43,7 +42,6 @@ import (
 
 	"github.com/spf13/viper"
 
-	properties "github.com/arduino/go-properties-map"
 	"github.com/bcmi-labs/arduino-cli/common"
 
 	"gopkg.in/yaml.v2"
@@ -109,61 +107,6 @@ func Default() Configs {
 	return defaultConfig
 }
 
-// UnserializeFromIDEPreferences loads the config from an IDE preferences.txt file, by Updating the specified otherConfigs.
-func UnserializeFromIDEPreferences(otherConfigs *Configs) error {
-	logrus.Info("Unserializing from IDE preferences")
-	props, err := properties.Load(filepath.Join(otherConfigs.ArduinoDataFolder, "preferences.txt"))
-	if err != nil {
-		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
-		return err
-	}
-	err = proxyConfigsFromIDEPrefs(otherConfigs, props)
-	if err != nil {
-		logrus.WithError(err).Warn("Error during unserialize from IDE preferences")
-		return err
-	}
-	sketchbookPath, exists := props.SubTree("sketchbook")["path"]
-	if exists {
-		otherConfigs.SketchbookPath = sketchbookPath
-	}
-	return nil
-}
-
-func proxyConfigsFromIDEPrefs(otherConfigs *Configs, props properties.Map) error {
-	proxy := props.SubTree("proxy")
-	typo := proxy["type"]
-	switch typo {
-	case "auto":
-		//automatic proxy
-		viper.Set("proxy.type", "auto")
-		break
-	case "manual":
-		//manual proxy configuration
-		manualConfig := proxy.SubTree("manual")
-		hostname, exists := manualConfig["hostname"]
-		if !exists {
-			return errors.New("Proxy ostname not found in preferences.txt")
-		}
-		username := manualConfig["username"]
-		password := manualConfig["password"]
-
-		otherConfigs.ProxyType = "manual"
-		otherConfigs.ProxyManualConfig = &ProxyConfigs{
-			Hostname: hostname,
-			Username: username,
-			Password: password,
-		}
-		viper.Set("proxy", *otherConfigs.ProxyManualConfig)
-		break
-	case "none":
-		//No proxy
-		break
-	default:
-		return errors.New("Unsupported config type")
-	}
-	return nil
-}
-
 // Unserialize loads the configs from a yaml file.
 // Returns the default configuration if there is an
 // error.