handle additional config, now they can be added in ~/.arduino-create

Author: umbynos

main.go

@@ -136,13 +136,18 @@ func main() {
 	go loop()
 
 	// SetupSystray is the main thread
+	configDir, err := getDefaultArduinoCreateConfigDir()
+	if err != nil {
+		log.Panicf("Can't open defaul configuration dir: %s", err)
+	}
 	Systray = systray.Systray{
 		Hibernate: *hibernate,
 		Version:   version + "-" + commit,
 		DebugURL: func() string {
 			return "http://" + *address + port
 		},
 		AdditionalConfig: *additionalConfig,
+		ConfigDir:        configDir,
 	}
 
 	path, err := os.Executable()

systray/systray.go

@@ -34,6 +34,8 @@ type Systray struct {
 	DebugURL func() string
 	// The active configuration file
 	AdditionalConfig string
+	// The path to the directory containing the configuration files
+	ConfigDir *paths.Path
 	// The path of the exe (only used in update)
 	path string
 }

systray/systray_real.go

@@ -20,10 +20,8 @@
 package systray
 
 import (
-	"fmt"
 	"os"
 	"os/user"
-	"path/filepath"
 
 	log "github.com/sirupsen/logrus"
 
@@ -155,7 +153,7 @@ func (s *Systray) end() {
 func (s *Systray) addConfigs() {
 	var mConfigCheckbox []*systray.MenuItem
 
-	configs := getConfigs()
+	configs := s.getConfigs()
 	if len(configs) > 1 {
 		for _, config := range configs {
 			entry := systray.AddMenuItem(config.Name, "")
@@ -185,35 +183,30 @@ type configIni struct {
 	Location string
 }
 
-// getconfigs parses all config files in the executable folder
-func getConfigs() []configIni {
-	// config.ini must be there, so call it Default
-	src, _ := os.Executable() // TODO change path
-	dest := filepath.Dir(src)
-
+// getConfigs parses all config files in the .arduino-create folder
+func (s *Systray) getConfigs() []configIni {
 	var configs []configIni
 
-	err := filepath.Walk(dest, func(path string, f os.FileInfo, _ error) error {
-		if !f.IsDir() {
-			if filepath.Ext(path) == ".ini" {
-				cfg, err := ini.LoadSources(ini.LoadOptions{IgnoreInlineComment: true, AllowPythonMultilineValues: true}, filepath.Join(dest, f.Name()))
-				if err != nil {
-					return err
-				}
-				defaultSection, err := cfg.GetSection("")
-				name := defaultSection.Key("name").String()
-				if name == "" || err != nil {
-					name = "Default config"
-				}
-				conf := configIni{Name: name, Location: f.Name()}
-				configs = append(configs, conf)
+	files, err := s.ConfigDir.ReadDir()
+	if err != nil {
+		log.Errorf("cannot read the content of %s", s.ConfigDir)
+		return nil
+	}
+	files.FilterOutDirs()
+	files.FilterSuffix(".ini")
+	for _, file := range files {
+		cfg, err := ini.LoadSources(ini.LoadOptions{IgnoreInlineComment: true, AllowPythonMultilineValues: true}, file.String())
+		if err != nil {
+			log.Errorf("error walking through executable configuration: %s", err)
+		} else {
+			defaultSection, err := cfg.GetSection("")
+			name := defaultSection.Key("name").String()
+			if name == "" || err != nil {
+				name = "Default config"
 			}
+			conf := configIni{Name: name, Location: file.String()}
+			configs = append(configs, conf)
 		}
-		return nil
-	})
-
-	if err != nil {
-		fmt.Println("error walking through executable configuration: %w", err)
 	}
 
 	return configs