Use gRPC function from CLI to create new sketch

Author: silvanocerza

cli/sketch/new.go

@@ -16,13 +16,15 @@
 package sketch
 
 import (
+	"context"
 	"os"
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/globals"
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	sk "github.com/arduino/arduino-cli/commands/sketch"
+	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
 )
@@ -48,11 +50,15 @@ func runNewCommand(cmd *cobra.Command, args []string) {
 		feedback.Errorf(tr("Error creating sketch: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
-	_, err = sk.CreateSketch(sketchDirPath)
+	_, err = sk.NewSketch(context.Background(), &rpc.NewSketchRequest{
+		Instance:   nil,
+		SketchName: sketchDirPath.Base(),
+		SketchDir:  sketchDirPath.Parent().String(),
+	})
 	if err != nil {
 		feedback.Errorf(tr("Error creating sketch: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
 
-	feedback.Print(tr("Sketch created in: %s", sketchDirPath.String()))
+	feedback.Print(tr("Sketch created in: %s", sketchDirPath))
 }

commands/sketch/new.go

@@ -33,19 +33,6 @@ void loop() {
 }
 `)
 
-// CreateSketch creates a new sketch
-func CreateSketch(sketchDirPath *paths.Path) (*paths.Path, error) {
-	if err := sketchDirPath.MkdirAll(); err != nil {
-		return nil, err
-	}
-	baseSketchName := sketchDirPath.Base()
-	sketchFilePath := sketchDirPath.Join(baseSketchName + globals.MainFileValidExtension)
-	if err := sketchFilePath.WriteFile(emptySketch); err != nil {
-		return nil, err
-	}
-	return sketchFilePath, nil
-}
-
 // NewSketch creates a new sketch via gRPC
 func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchResponse, error) {
 	var sketchesDir string
@@ -55,10 +42,14 @@ func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchRe
 		sketchesDir = configuration.Settings.GetString("directories.User")
 	}
 	sketchDirPath := paths.New(sketchesDir).Join(req.SketchName)
-	sketchFilePath, err := CreateSketch(sketchDirPath)
-	if err != nil {
+	if err := sketchDirPath.MkdirAll(); err != nil {
+		return nil, &commands.CantCreateSketchError{Cause: err}
+	}
+	sketchName := sketchDirPath.Base()
+	sketchMainFilePath := sketchDirPath.Join(sketchName + globals.MainFileValidExtension)
+	if err := sketchMainFilePath.WriteFile(emptySketch); err != nil {
 		return nil, &commands.CantCreateSketchError{Cause: err}
 	}
 
-	return &rpc.NewSketchResponse{MainFile: sketchFilePath.String()}, nil
+	return &rpc.NewSketchResponse{MainFile: sketchMainFilePath.String()}, nil
 }

rpc/cc/arduino/cli/commands/v1/commands.proto

@@ -288,9 +288,10 @@ message NewSketchRequest {
   Instance instance = 1;
   // New sketch name
   string sketch_name = 2;
-  // Optional: create a sketch directory in this directory
-  // (used as "sketches" directory), the directory must exist.
-  // "directories.User" directory will be used otherwise.
+  // Optional: create a Sketch in this directory
+  // (used as "Sketchbook" directory).
+  // Default Sketchbook directory "directories.User" is used if sketch_dir is
+  // empty.
   string sketch_dir = 3;
 }