chore: refactor internal tool structure (#37)

* Remove callback function and download archives automatically

* Create client inside DownloadImage function

* Move interaction with user closer to cobra function

* Reorganize project structure

* Run task fmt

Author: MatteoPologruto

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,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 download
 
 import (
 	"context"
@@ -22,12 +22,12 @@ import (
 	"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",
@@ -52,8 +52,7 @@ func runDownloadCommand(ctx context.Context, args []string, destDir string) {
 		feedback.Fatal(i18n.Tr("error: %s is not a directory. Please, select an existing directory.", destDir), feedback.ErrBadArgument)
 	}
 
-	client := updater.NewClient()
-	downloadPath, _, err := updater.DownloadImage(ctx, 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)
 	}

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

drivers/dpinst-amd64.exe …flasher-cli/drivers/src/dpinst-amd64.exedrivers/dpinst-amd64.exe renamed to cmd/arduino-flasher-cli/drivers/src/dpinst-amd64.exe drivers/dpinst-amd64.exe renamed to cmd/arduino-flasher-cli/drivers/src/dpinst-amd64.exe

@@ -13,23 +13,25 @@
 // 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 flash
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"runtime"
+	"strings"
 
 	"github.com/arduino/go-paths-helper"
 	runas "github.com/arduino/go-windows-runas"
 	"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 newFlashCmd() *cobra.Command {
+func NewFlashCmd() *cobra.Command {
 	var forceYes bool
 	var tempDir string
 	appCmd := &cobra.Command{
@@ -95,8 +97,25 @@ func runFlashCommand(ctx context.Context, args []string, forceYes bool, tempDir
 		feedback.Fatal(i18n.Tr("could not find image absolute path: %v", err), feedback.ErrBadArgument)
 	}
 
+	if !forceYes {
+		feedback.Print("\nWARNING: flashing a new Linux image on the board will erase any existing data you have on it.")
+		feedback.Printf("Do you want to proceed and flash %s on the board? (yes/no)", args[0])
+
+		var yesInput string
+		_, err := fmt.Scanf("%s\n", &yesInput)
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+		}
+		yes := strings.ToLower(yesInput) == "yes" || strings.ToLower(yesInput) == "y"
+
+		if !yes {
+			return
+		}
+	}
+
 	err = updater.Flash(ctx, imagePath, args[0], forceYes, tempDir)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error flashing the board: %v", err), feedback.ErrBadArgument)
 	}
+	feedback.Print("\nThe board has been successfully flashed. You can now power-cycle the board (unplug and re-plug). Remember to remove the jumper.")
 }