Refactoring 'sketch' commands

Author: cmaglie

commands/daemon/daemon.go

@@ -438,7 +438,7 @@ func (s *ArduinoCoreServerImpl) LibraryList(ctx context.Context, req *rpc.Librar
 // ArchiveSketch FIXMEDOC
 func (s *ArduinoCoreServerImpl) ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.ArchiveSketchResponse, error) {
 	resp, err := sketch.ArchiveSketch(ctx, req)
-	return resp, err.Err()
+	return resp, convertErrorToRPCStatus(err)
 }
 
 //ZipLibraryInstall FIXMEDOC

commands/sketch/archive.go

@@ -23,17 +23,16 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/sketch"
+	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	paths "github.com/arduino/go-paths-helper"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 var tr = i18n.Tr
 
 // ArchiveSketch FIXMEDOC
-func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.ArchiveSketchResponse, *status.Status) {
+func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.ArchiveSketchResponse, error) {
 	// sketchName is the name of the sketch without extension, for example "MySketch"
 	var sketchName string
 
@@ -44,7 +43,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 
 	s, err := sketch.New(sketchPath)
 	if err != nil {
-		return nil, status.Convert(err)
+		return nil, &commands.SketchNotFoundError{Cause: err}
 	}
 
 	sketchPath = s.FullPath
@@ -57,7 +56,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 
 	archivePath, err = archivePath.Clean().Abs()
 	if err != nil {
-		return nil, status.Newf(codes.Unknown, tr("Error getting absolute archive path %v"), err)
+		return nil, &commands.PermissionDeniedError{Message: tr("Error getting absolute path of sketch archive"), Cause: err}
 	}
 
 	// Makes archivePath point to a zip file
@@ -68,18 +67,18 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 	}
 
 	if archivePath.Exist() {
-		return nil, status.New(codes.InvalidArgument, tr("Archive already exists"))
+		return nil, &commands.InvalidArgumentError{Message: tr("Archive already exists")}
 	}
 
 	filesToZip, err := sketchPath.ReadDirRecursive()
 	if err != nil {
-		return nil, status.Newf(codes.Unknown, tr("Error retrieving sketch files: %v"), err)
+		return nil, &commands.PermissionDeniedError{Message: tr("Error reading sketch files"), Cause: err}
 	}
 	filesToZip.FilterOutDirs()
 
 	archive, err := archivePath.Create()
 	if err != nil {
-		return nil, status.Newf(codes.PermissionDenied, tr("Error creating archive: %v"), err)
+		return nil, &commands.PermissionDeniedError{Message: tr("Error creating sketch archive"), Cause: err}
 	}
 	defer archive.Close()
 
@@ -91,7 +90,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 		if !req.IncludeBuildDir {
 			filePath, err := sketchPath.Parent().RelTo(f)
 			if err != nil {
-				return nil, status.Newf(codes.Unknown, tr("Error calculating relative file path: %v"), err)
+				return nil, &commands.PermissionDeniedError{Message: tr("Error calculating relative file path"), Cause: err}
 			}
 
 			// Skips build folder
@@ -102,9 +101,8 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 
 		// We get the parent path since we want the archive to unpack as a folder.
 		// If we don't do this the archive would contain all the sketch files as top level.
-		err = addFileToSketchArchive(zipWriter, f, sketchPath.Parent())
-		if err != nil {
-			return nil, status.Newf(codes.Unknown, tr("Error adding file to archive: %v"), err)
+		if err := addFileToSketchArchive(zipWriter, f, sketchPath.Parent()); err != nil {
+			return nil, &commands.PermissionDeniedError{Message: tr("Error adding file to sketch archive"), Cause: err}
 		}
 	}