Merge branch 'main' into preserve-user

Author: MatteoPologruto

.github/workflows/release.yml

@@ -33,6 +33,7 @@ jobs:
       - name: Tag version
         run: |
           VERSION=${GITHUB_REF##*/}
+          VERSION=${VERSION#v}
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
           echo "RELEASE_NAME=${{ env.PROJECT_NAME }}-${VERSION}-${{ matrix.os }}-${{ matrix.arch }}" >> $GITHUB_ENV
         env:
@@ -157,6 +158,7 @@ jobs:
       - name: Set environment variables
         run: |
           VERSION="${GITHUB_REF##*/}"
+          VERSION="${VERSION#v}"
           echo "PACKAGE_FILENAME=${{ env.PROJECT_NAME }}-${VERSION}-${{ matrix.build }}.tar.gz" >>$GITHUB_ENV
 
       - name: Checkout repository

Taskfile.yml

@@ -65,21 +65,21 @@ tasks:
     vars:
       VERSION: "{{.VERSION }}"
     cmds:
-      - cmd: go build -ldflags "-X main.Version={{.VERSION}}" -v -o ./build/arduino-flasher-cli .
+      - cmd: go build -ldflags "-X main.Version={{.VERSION}}" -v -o ./build/arduino-flasher-cli ./cmd/arduino-flasher-cli/
         platforms: [linux, darwin]
-      - cmd: go build -ldflags "-X main.Version={{.VERSION}}" -v -o ./build/arduino-flasher-cli.exe .
+      - cmd: go build -ldflags "-X main.Version={{.VERSION}}" -v -o ./build/arduino-flasher-cli.exe ./cmd/arduino-flasher-cli/
         platforms: [windows]
 
   build:artifacts:
     desc: Prepare the arduino-flasher-cli artifacts
     internal: true
     status:
-      - test -f ./updater/artifacts/resources_darwin_amd64/qdl
-      - test -f ./updater/artifacts/resources_darwin_arm64/qdl
-      - test -f ./updater/artifacts/resources_linux_amd64/qdl
-      - test -f ./updater/artifacts/resources_linux_arm64/qdl
-      - test -f ./updater/artifacts/resources_windows_amd64/qdl.exe
-    cmd: sh ./updater/artifacts/download_resources.sh
+      - test -f ./internal/updater/artifacts/resources_darwin_amd64/qdl
+      - test -f ./internal/updater/artifacts/resources_darwin_arm64/qdl
+      - test -f ./internal/updater/artifacts/resources_linux_amd64/qdl
+      - test -f ./internal/updater/artifacts/resources_linux_arm64/qdl
+      - test -f ./internal/updater/artifacts/resources_windows_amd64/qdl.exe
+    cmd: sh ./internal/updater/artifacts/download_resources.sh
 
   release:
     desc: Create a tag on the current commit and push it to the remote to create the release

download.go …arduino-flasher-cli/download/download.godownload.go renamed to cmd/arduino-flasher-cli/download/download.go download.go renamed to cmd/arduino-flasher-cli/download/download.go

@@ -13,46 +13,49 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to [email protected].
 
-package main
+package download
 
 import (
+	"context"
 	"os"
 
 	"github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
 
-	"github.com/arduino/arduino-flasher-cli/feedback"
-	"github.com/arduino/arduino-flasher-cli/i18n"
-	"github.com/arduino/arduino-flasher-cli/updater"
+	"github.com/arduino/arduino-flasher-cli/cmd/feedback"
+	"github.com/arduino/arduino-flasher-cli/cmd/i18n"
+	"github.com/arduino/arduino-flasher-cli/internal/updater"
 )
 
-func newDownloadCmd() *cobra.Command {
+func NewDownloadCmd() *cobra.Command {
 	var destDir string
 	cmd := &cobra.Command{
 		Use:   "download",
 		Short: "Download a Linux image to the specified path",
 		Args:  cobra.ExactArgs(1),
 		Example: " " + os.Args[0] + " download latest\n" +
+			" " + os.Args[0] + " download 20251024-412\n" +
 			" " + os.Args[0] + " download latest --dest-dir /tmp\n",
 		Run: func(cmd *cobra.Command, args []string) {
-			runDownloadCommand(args, destDir)
+			runDownloadCommand(cmd.Context(), args, destDir)
 		},
 	}
 	cmd.Flags().StringVar(&destDir, "dest-dir", ".", "Path to the directory in which the image will be downloaded")
 
 	return cmd
 }
 
-func runDownloadCommand(args []string, destDir string) {
+func runDownloadCommand(ctx context.Context, args []string, destDir string) {
 	targetVersion := args[0]
 	downloadPath := paths.New(destDir)
 	if !downloadPath.IsDir() {
-		feedback.Fatal(i18n.Tr("error: %s is not a directory", destDir), feedback.ErrBadArgument)
+		feedback.Fatal(i18n.Tr("error: %s is not a directory. Please, select an existing directory.", destDir), feedback.ErrBadArgument)
 	}
 
-	client := updater.NewClient()
-	_, _, err := updater.DownloadImage(client, targetVersion, nil, true, downloadPath)
+	downloadPath, _, err := updater.DownloadImage(ctx, targetVersion, downloadPath)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error downloading the image: %v", err), feedback.ErrBadArgument)
 	}
+	pathAbs, _ := downloadPath.Abs()
+	feedback.Print(i18n.Tr("\nDebian image successfully downloaded: %s", pathAbs.String()))
 }

drivers.go …d/arduino-flasher-cli/drivers/drivers.godrivers.go renamed to cmd/arduino-flasher-cli/drivers/drivers.go drivers.go renamed to cmd/arduino-flasher-cli/drivers/drivers.go

@@ -13,16 +13,16 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to [email protected].
 
-package main
+package drivers
 
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/arduino/arduino-flasher-cli/feedback"
-	"github.com/arduino/arduino-flasher-cli/i18n"
+	"github.com/arduino/arduino-flasher-cli/cmd/feedback"
+	"github.com/arduino/arduino-flasher-cli/cmd/i18n"
 )
 
-func newInstallDriversCmd() *cobra.Command {
+func NewInstallDriversCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:    "install-drivers",
 		Hidden: true,

drivers_others.go …no-flasher-cli/drivers/drivers_others.godrivers_others.go renamed to cmd/arduino-flasher-cli/drivers/drivers_others.go drivers_others.go renamed to cmd/arduino-flasher-cli/drivers/drivers_others.go

@@ -15,7 +15,7 @@
 
 //go:build !windows
 
-package main
+package drivers
 
 // installDrivers is a no-op on non-Windows platforms
 func installDrivers() error {

drivers_windows.go …o-flasher-cli/drivers/drivers_windows.godrivers_windows.go renamed to cmd/arduino-flasher-cli/drivers/drivers_windows.go drivers_windows.go renamed to cmd/arduino-flasher-cli/drivers/drivers_windows.go

@@ -13,7 +13,7 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to [email protected].
 
-package main
+package drivers
 
 import (
 	"embed"
@@ -23,7 +23,7 @@ import (
 	"github.com/arduino/go-paths-helper"
 )
 
-//go:embed drivers
+//go:embed src
 var drivers embed.FS
 
 // installDrivers installs the Windows driver using dpinst.exe. This requires