arduino#1456 - Use "diretories.User" dir instead of newly introduced "directories.Sketches"

Author: 4ntoine

Diff for: cli/config/validate.go

@@ -26,7 +26,6 @@ var validMap = map[string]reflect.Kind{
 	"directories.data":              reflect.String,
 	"directories.downloads":         reflect.String,
 	"directories.user":              reflect.String,
-        "directories.sketches":          reflect.String,
 	"library.enable_unsafe_install": reflect.Bool,
 	"logging.file":                  reflect.String,
 	"logging.format":                reflect.String,

Diff for: commands/sketch/new.go

@@ -49,7 +49,7 @@ func CreateSketch(sketchDir string, sketchName string) (string, error) {
 
 // NewSketch FIXMEDOC
 func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchResponse, error) {
-	sketchesDir := configuration.Settings.GetString("directories.Sketches");
+	sketchesDir := configuration.Settings.GetString("directories.User");
 	sketchDir := filepath.Join(sketchesDir, req.SketchName)
 	sketchFile, err := CreateSketch(sketchDir, req.SketchName)
 	if err != nil {

Diff for: configuration/configuration_test.go

@@ -93,7 +93,6 @@ func TestInit(t *testing.T) {
 	require.NotEmpty(t, settings.GetString("directories.Data"))
 	require.NotEmpty(t, settings.GetString("directories.Downloads"))
 	require.NotEmpty(t, settings.GetString("directories.User"))
-	require.NotEmpty(t, settings.GetString("directories.Sketches"))
 
 	require.Equal(t, "50051", settings.GetString("daemon.port"))
 

Diff for: configuration/defaults.go

@@ -38,8 +38,6 @@ func SetDefaults(settings *viper.Viper) {
 	settings.SetDefault("directories.Data", getDefaultArduinoDataDir())
 	settings.SetDefault("directories.Downloads", filepath.Join(getDefaultArduinoDataDir(), "staging"))
 	settings.SetDefault("directories.User", getDefaultUserDir())
-        settings.SetDefault("directories.Sketches",
-filepath.Join(getDefaultUserDir(), "sketches"))
 
 	// Sketch compilation
 	settings.SetDefault("sketch.always_export_binaries", false)

Diff for: docs/configuration.md

@@ -9,7 +9,6 @@
   - `downloads` - directory used to stage downloaded archives during Boards/Library Manager installations.
   - `user` - the equivalent of the Arduino IDE's ["sketchbook" directory][sketchbook directory]. Library Manager
     installations are made to the `libraries` subdirectory of the user directory.
-  - `sketches` - directory used to store user sketches if called via gRPC.
 - `library` - configuration options relating to Arduino libraries.
   - `enable_unsafe_install` - set to `true` to enable the use of the `--git-url` and `--zip-file` flags with
     [`arduino-cli lib install`][arduino cli lib install]. These are considered "unsafe" installation methods because