[skip changelog] Remove duplicated code and enhance tests

Author: silvanocerza

arduino/sketches/sketches.go

@@ -138,14 +138,10 @@ func CheckForPdeFiles(sketch *paths.Path) []*paths.Path {
 		sketch = sketch.Parent()
 	}
 
-	// It's not a problem if we can't read files right now
-	files, _ := sketch.ReadDirRecursive()
-	files.FilterOutDirs()
-	res := []*paths.Path{}
-	for _, f := range files {
-		if f.Ext() == ".pde" {
-			res = append(res, f)
-		}
+	files, err := sketch.ReadDirRecursive()
+	if err != nil {
+		return []*paths.Path{}
 	}
-	return res
+	files.FilterSuffix(".pde")
+	return files
 }

commands/sketch/archive.go

@@ -23,10 +23,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/arduino/arduino-cli/arduino/globals"
+	"github.com/arduino/arduino-cli/arduino/sketches"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
-	"github.com/pkg/errors"
 )
 
 // ArchiveSketch FIXMEDOC
@@ -39,39 +38,13 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchReq) (*rpc.Archive
 		sketchPath = paths.New(".")
 	}
 
-	sketchPath, err := sketchPath.Clean().Abs()
+	sketch, err := sketches.NewSketchFromPath(sketchPath)
 	if err != nil {
-		return nil, fmt.Errorf("Error getting absolute sketch path %v", err)
+		return nil, err
 	}
 
-	// Make sketchPath point to the sketch folder
-	if sketchPath.IsNotDir() {
-		sketchPath = sketchPath.Parent()
-	}
-
-	sketchName = sketchPath.Base()
-
-	// sketchMainFile is the path to the sketch main file
-	var sketchMainFile *paths.Path
-
-	for ext := range globals.MainFileValidExtensions {
-		candidateSketchMainFile := sketchPath.Join(sketchPath.Base() + ext)
-		if candidateSketchMainFile.Exist() {
-			if sketchMainFile == nil {
-				sketchMainFile = candidateSketchMainFile
-			} else {
-				return nil, errors.Errorf("multiple main sketch files found (%v, %v)",
-					sketchMainFile,
-					candidateSketchMainFile,
-				)
-			}
-		}
-	}
-
-	// Checks if it's really a sketch
-	if sketchMainFile == nil {
-		return nil, fmt.Errorf("specified path is not a sketch: %v", sketchPath.String())
-	}
+	sketchPath = sketch.FullPath
+	sketchName = sketch.Name
 
 	archivePath := paths.New(req.ArchivePath)
 	if archivePath == nil {

test/test_upload.py

@@ -13,9 +13,8 @@
 # software without disclosing the source code of your own applications. To purchase
 # a commercial license, send an email to [email protected].
 import os
-import hashlib
-import tempfile
 import shutil
+import json
 from pathlib import Path
 
 import pytest
@@ -250,7 +249,10 @@ def test_upload_sketch_with_pde_extension(run_command, data_dir, detected_boards
         assert run_command(f"core install {core}")
 
         # Compile sketch first
-        assert run_command(f"compile --clean -b {board.fqbn} {sketch_path}")
+        res = run_command(f"compile --clean -b {board.fqbn} {sketch_path} --format json")
+        assert res.ok
+        data = json.loads(res.stdout)
+        build_dir = Path(data["builder_result"]["build_path"])
 
         # Upload from sketch folder
         wait_for_board()
@@ -260,9 +262,6 @@ def test_upload_sketch_with_pde_extension(run_command, data_dir, detected_boards
         wait_for_board()
         assert run_command(f"upload -b {board.fqbn} -p {board.address} {sketch_file}")
 
-        # Upload from build folder
-        sketch_path_md5 = hashlib.md5(bytes(sketch_path)).hexdigest().upper()
-        build_dir = Path(tempfile.gettempdir(), f"arduino-sketch-{sketch_path_md5}")
         wait_for_board()
         res = run_command(f"upload -b {board.fqbn} -p {board.address} --input-dir {build_dir}")
         assert (
@@ -301,14 +300,14 @@ def test_upload_with_input_dir_containing_multiple_binaries(run_command, data_di
         assert run_command(f"core install {core}")
 
         # Compile both sketches and copy binaries in the same directory same build directory
-        assert run_command(f"compile --clean -b {board.fqbn} {sketch_one_path}")
-        assert run_command(f"compile --clean -b {board.fqbn} {sketch_two_path}")
-
-        sketch_path_md5 = hashlib.md5(bytes(sketch_one_path)).hexdigest().upper()
-        build_dir_one = Path(tempfile.gettempdir(), f"arduino-sketch-{sketch_path_md5}")
-
-        sketch_path_md5 = hashlib.md5(bytes(sketch_two_path)).hexdigest().upper()
-        build_dir_two = Path(tempfile.gettempdir(), f"arduino-sketch-{sketch_path_md5}")
+        res = run_command(f"compile --clean -b {board.fqbn} {sketch_one_path} --format json")
+        assert res.ok
+        data = json.loads(res.stdout)
+        build_dir_one = Path(data["builder_result"]["build_path"])
+        res = run_command(f"compile --clean -b {board.fqbn} {sketch_two_path} --format json")
+        assert res.ok
+        data = json.loads(res.stdout)
+        build_dir_two = Path(data["builder_result"]["build_path"])
 
         # Copy binaries to same folder
         binaries_dir = Path(data_dir, "build", "BuiltBinaries")