NewConstPath now keeps labels and autocreation of folders

Author: cmaglie

configs/env_vars_serializer.go

@@ -41,10 +41,10 @@ func LoadFromEnv() {
 		ProxyType = p
 	}
 	if dir, has := os.LookupEnv("ARDUINO_SKETCHBOOK_DIR"); has {
-		SketchbookFolder = pathutils.NewConstPath(dir)
+		SketchbookFolder = pathutils.NewConstPath("Sketchbook", dir, true)
 		ArduinoHomeFolder = SketchbookFolder
 	}
 	if dir, has := os.LookupEnv("ARDUINO_DATA_DIR"); has {
-		ArduinoDataFolder = pathutils.NewConstPath(dir)
+		ArduinoDataFolder = pathutils.NewConstPath("Arduino Data", dir, true)
 	}
 }

configs/preferences_txt_serializer.go

@@ -99,7 +99,7 @@ func LoadFromDesktopIDEPreferences() error {
 		return err
 	}
 	if dir, has := props["sketchbook.path"]; has {
-		SketchbookFolder = pathutils.NewConstPath(dir)
+		SketchbookFolder = pathutils.NewConstPath("Sketchbook", dir, true)
 		ArduinoHomeFolder = SketchbookFolder
 	}
 	if URLs, has := props["boardsmanager.additional.urls"]; has {

configs/yaml_serializer.go

@@ -70,10 +70,10 @@ func LoadFromYAML(path string) error {
 	}
 
 	if ret.ArduinoDataFolder != "" {
-		ArduinoDataFolder = pathutils.NewConstPath(ret.ArduinoDataFolder)
+		ArduinoDataFolder = pathutils.NewConstPath("Arduino Data", ret.ArduinoDataFolder, true)
 	}
 	if ret.SketchbookPath != "" {
-		SketchbookFolder = pathutils.NewConstPath(ret.SketchbookPath)
+		SketchbookFolder = pathutils.NewConstPath("Sketchbook", ret.SketchbookPath, true)
 	}
 	if ret.ProxyType != "" {
 		ProxyType = ret.ProxyType

pathutils/pathutils.go

@@ -43,8 +43,14 @@ type Path interface {
 
 // NewConstPath creates a constant Path that always returns the specified
 // path, errors will always be nil
-func NewConstPath(path string) Path {
-	return &constPath{Path: path}
+func NewConstPath(label string, path string, createIfMissing bool) Path {
+	return &basicPath{
+		Label: label,
+		ProviderFunction: func() (string, error) {
+			return path, nil
+		},
+		CreateIfMissing: createIfMissing,
+	}
 }
 
 // NewPath return a Path object that use the providerFunction to determine
@@ -70,14 +76,6 @@ func NewSubPath(label string, path Path, subPath string, createIfMissing bool) P
 	}
 }
 
-type constPath struct {
-	Path string
-}
-
-func (p *constPath) Get() (string, error) {
-	return p.Path, nil
-}
-
 type basicPath struct {
 	Label            string
 	ProviderFunction func() (string, error)