#1456 - Use go-paths-helper

Author: 4ntoine

cli/sketch/new.go

@@ -17,12 +17,12 @@ package sketch
 
 import (
 	"os"
-	"path/filepath"
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/globals"
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
+	paths "github.com/arduino/go-paths-helper"
 	sk "github.com/arduino/arduino-cli/commands/sketch"
 	"github.com/spf13/cobra"
 )
@@ -43,16 +43,16 @@ func runNewCommand(cmd *cobra.Command, args []string) {
 	// Trim to avoid issues if user creates a sketch adding the .ino extesion to the name
 	sketchName := args[0]
 	trimmedSketchName := strings.TrimSuffix(sketchName, globals.MainFileValidExtension)
-	sketchDir, err := filepath.Abs(trimmedSketchName)
+	sketchDirPath, err := paths.New(trimmedSketchName).Abs()
 	if err != nil {
 		feedback.Errorf(tr("Error creating sketch: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
-	_, err = sk.CreateSketch(sketchDir, sketchName)
+	_, err = sk.CreateSketch(sketchDirPath)
 	if err != nil {
 		feedback.Errorf(tr("Error creating sketch: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
 
-	feedback.Print(tr("Sketch created in: %s", sketchDir))
+	feedback.Print(tr("Sketch created in: %s", sketchDirPath.String()))
 }

commands/sketch/new.go

@@ -17,13 +17,11 @@ package sketch
 
 import (
 	"context"
-	"io/ioutil"
-	"os"
-	"path/filepath"
 
 	"github.com/arduino/arduino-cli/arduino/globals"
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/configuration"
+	paths "github.com/arduino/go-paths-helper"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 )
 
@@ -36,31 +34,31 @@ void loop() {
 `)
 
 // CreateSketch creates a new sketch
-func CreateSketch(sketchDir string, sketchName string) (string, error) {
-	if err := os.MkdirAll(sketchDir, os.FileMode(0755)); err != nil {
-		return "", err
+func CreateSketch(sketchDirPath *paths.Path) (*paths.Path, error) {
+	if err := sketchDirPath.MkdirAll(); err != nil {
+		return nil, err
 	}
-	baseSketchName := filepath.Base(sketchDir)
-	sketchFile := filepath.Join(sketchDir, baseSketchName+globals.MainFileValidExtension)
-	if err := ioutil.WriteFile(sketchFile, emptySketch, os.FileMode(0644)); err != nil {
-		return "", err
+	baseSketchName := sketchDirPath.Base()
+	sketchFilePath := sketchDirPath.Join(baseSketchName+globals.MainFileValidExtension)
+	if err := sketchFilePath.WriteFile(emptySketch); err != nil {
+		return nil, err
 	}
-	return sketchFile, nil
+	return sketchFilePath, nil
 }
 
-// NewSketch FIXMEDOC
+// NewSketch creates a new sketch via gRPC
 func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchResponse, error) {
 	var sketchesDir string
 	if len(req.SketchDir) > 0 {
 		sketchesDir = req.SketchDir
 	} else {
 		sketchesDir = configuration.Settings.GetString("directories.User")
 	}
-	sketchDir := filepath.Join(sketchesDir, req.SketchName)
-	sketchFile, err := CreateSketch(sketchDir, req.SketchName)
+	sketchDirPath := paths.New(sketchesDir).Join(req.SketchName)
+	sketchFilePath, err := CreateSketch(sketchDirPath)
 	if err != nil {
 		return nil, &commands.CantCreateSketchError{Cause: err}
 	}
 
-	return &rpc.NewSketchResponse{MainFile: sketchFile}, nil
+	return &rpc.NewSketchResponse{MainFile: sketchFilePath.String()}, nil
 }