Copy extracted files to the correct path instead of using the the renamer

Author: MatteoPologruto

v2/pkgs/tools.go

@@ -33,6 +33,7 @@ import (
 	"github.com/arduino/arduino-create-agent/gen/tools"
 	"github.com/arduino/arduino-create-agent/index"
 	"github.com/arduino/arduino-create-agent/utilities"
+	"github.com/arduino/go-paths-helper"
 	"github.com/codeclysm/extract/v3"
 )
 
@@ -222,12 +223,36 @@ func (t *Tools) install(ctx context.Context, path, url, checksum string) (*tools
 		return nil, err
 	}
 
-	err = extract.Archive(ctx, &buffer, t.folder, rename(path))
+	tempPath := paths.TempDir()
+	// Create a temporary dir to extract package
+	if err := tempPath.MkdirAll(); err != nil {
+		return nil, fmt.Errorf("creating temp dir for extraction: %s", err)
+	}
+	tempDir, err := tempPath.MkTempDir("package-")
 	if err != nil {
-		os.RemoveAll(safePath)
+		return nil, fmt.Errorf("creating temp dir for extraction: %s", err)
+	}
+	defer tempDir.RemoveAll()
+
+	err = extract.Archive(ctx, &buffer, tempDir.String(), nil)
+	if err != nil {
+		os.RemoveAll(tempDir.String())
 		return nil, err
 	}
 
+	// Check package content and find package root dir
+	root, err := findPackageRoot(tempDir)
+	if err != nil {
+		return nil, fmt.Errorf("searching package root dir: %s", err)
+	}
+
+	location := paths.New(safePath)
+	if err := root.Rename(location); err != nil {
+		if err := root.CopyDirTo(location); err != nil {
+			return nil, fmt.Errorf("moving extracted archive to destination dir: %s", err)
+		}
+	}
+
 	// Write installed.json for retrocompatibility with v1
 	err = writeInstalled(t.folder, path)
 	if err != nil {
@@ -253,15 +278,6 @@ func (t *Tools) Remove(ctx context.Context, payload *tools.ToolPayload) (*tools.
 	return &tools.Operation{Status: "ok"}, nil
 }
 
-func rename(base string) extract.Renamer {
-	return func(path string) string {
-		parts := strings.Split(filepath.ToSlash(path), "/")
-		path = strings.Join(parts[1:], "/")
-		path = filepath.Join(base, path)
-		return path
-	}
-}
-
 func writeInstalled(folder, path string) error {
 	// read installed.json
 	installed := map[string]string{}
@@ -295,3 +311,17 @@ func writeInstalled(folder, path string) error {
 
 	return os.WriteFile(installedFile, data, 0644)
 }
+
+func findPackageRoot(parent *paths.Path) (*paths.Path, error) {
+	files, err := parent.ReadDir()
+	if err != nil {
+		return nil, fmt.Errorf("reading package root dir: %s", err)
+	}
+	files.FilterOutPrefix("__MACOSX")
+
+	// if there is only one dir, it is the root dir
+	if len(files) == 1 && files[0].IsDir() {
+		return files[0], nil
+	}
+	return parent, nil
+}