Change directories.template to sketch.template

arduino · Oct 19, 2023 · 4c89403 · 4c89403
1 parent 6840c9a
commit 4c89403
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/commands/sketch/new.go b/commands/sketch/new.go
@@ -55,29 +55,25 @@ func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchRe
 		return nil, err
 	}
 
-	templateDir := configuration.Settings.GetString("directories.template")
+	templateDir := configuration.Settings.GetString("sketch.template")
 	sketchDirPath := paths.New(sketchesDir).Join(req.SketchName)
+	sketchName := sketchDirPath.Base()
+	sketchMainFilePath := sketchDirPath.Join(sketchName + globals.MainFileValidExtension)
 
-	var sketchMainFilePath *paths.Path
 	if templateDir != "" {
 		templateDirPath := paths.New(templateDir)
 		if err := templateDirPath.CopyDirTo(sketchDirPath); err != nil {
 			return nil, &arduino.CantCreateSketchError{Cause: err}
 		}
-		// TODO: Make this customizable?
-		sketchMainFilePath = sketchDirPath.Join("main.ino")
 	} else {
 		if err := sketchDirPath.MkdirAll(); err != nil {
 			return nil, &arduino.CantCreateSketchError{Cause: err}
 		}
-		sketchName := sketchDirPath.Base()
-		sketchMainFilePath = sketchDirPath.Join(sketchName + globals.MainFileValidExtension)
 		if !req.Overwrite {
 			if sketchMainFilePath.Exist() {
 				return nil, &arduino.CantCreateSketchError{Cause: errors.New(tr(".ino file already exists"))}
 			}
 		}
-
 		if err := sketchMainFilePath.WriteFile(emptySketch); err != nil {
 			return nil, &arduino.CantCreateSketchError{Cause: err}
 		}

diff --git a/configuration/defaults.go b/configuration/defaults.go
@@ -38,7 +38,6 @@ func SetDefaults(settings *viper.Viper) {
 	// arduino directories
 	settings.SetDefault("directories.Data", getDefaultArduinoDataDir())
 	settings.SetDefault("directories.Downloads", filepath.Join(getDefaultArduinoDataDir(), "staging"))
-	settings.SetDefault("directories.Template", "")
 	settings.SetDefault("directories.User", getDefaultUserDir())
 
 	// Sketch compilation
@@ -70,4 +69,6 @@ func SetDefaults(settings *viper.Viper) {
 	settings.BindEnv("directories.Downloads", "ARDUINO_DOWNLOADS_DIR")
 	settings.BindEnv("directories.Data", "ARDUINO_DATA_DIR")
 	settings.BindEnv("sketch.always_export_binaries", "ARDUINO_SKETCH_ALWAYS_EXPORT_BINARIES")
+
+	settings.SetDefault("sketch.template", "")
 }
diff --git a/internal/cli/config/validate.go b/internal/cli/config/validate.go
@@ -27,7 +27,6 @@ var validMap = map[string]reflect.Kind{
 	"daemon.port":                   reflect.String,
 	"directories.data":              reflect.String,
 	"directories.downloads":         reflect.String,
-	"directories.template":          reflect.String,
 	"directories.user":              reflect.String,
 	"directories.builtin.tools":     reflect.String,
 	"directories.builtin.libraries": reflect.String,
@@ -37,6 +36,7 @@ var validMap = map[string]reflect.Kind{
 	"logging.format":                reflect.String,
 	"logging.level":                 reflect.String,
 	"sketch.always_export_binaries": reflect.Bool,
+	"sketch.template":               reflect.String,
 	"metrics.addr":                  reflect.String,
 	"metrics.enabled":               reflect.Bool,
 	"network.proxy":                 reflect.String,