WIP: move logic closer to the cobra command

Author: MatteoPologruto

flash.go

@@ -17,18 +17,25 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"runtime"
+	"strings"
 
 	"github.com/arduino/go-paths-helper"
 	runas "github.com/arduino/go-windows-runas"
+	"github.com/shirou/gopsutil/v4/disk"
 	"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"
 )
 
+const GiB = uint64(1024 * 1024 * 1024)
+const DownloadDiskSpace = uint64(12)
+const ExtractDiskSpace = uint64(10)
+
 func newFlashCmd() *cobra.Command {
 	var forceYes bool
 	var tempDir string
@@ -90,12 +97,81 @@ func checkDriversInstalled() {
 }
 
 func runFlashCommand(ctx context.Context, args []string, forceYes bool, tempDir string) {
+	version := args[0]
 	imagePath, err := paths.New(args[0]).Abs()
 	if err != nil {
 		feedback.Fatal(i18n.Tr("could not find image absolute path: %v", err), feedback.ErrBadArgument)
 	}
 
-	err = updater.Flash(ctx, imagePath, args[0], forceYes, tempDir)
+	if !imagePath.Exist() {
+		client := updater.NewClient()
+
+		temp, err := updater.SetTempDir("download-", tempDir)
+		if err != nil {
+			feedback.Fatal(i18n.Tr("error creating a temporary directory to extract the archive: %v", err), feedback.ErrBadArgument)
+		}
+		defer func() { _ = temp.RemoveAll() }()
+
+		// Check if there is enough free disk space before downloading and extracting an image
+		d, err := disk.Usage(temp.String())
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+		}
+		if d.Free/GiB < DownloadDiskSpace {
+			feedback.Fatal(i18n.Tr("download and extraction requires up to %d GiB of free space", DownloadDiskSpace), feedback.ErrBadArgument)
+		}
+
+		tempImagePath, v, err := updater.DownloadAndExtract(ctx, client, version, temp)
+
+		if err != nil {
+			feedback.Fatal(i18n.Tr("could not download and extract the image: %v", err), feedback.ErrBadArgument)
+		}
+
+		defer func() { _ = tempImagePath.Parent().RemoveAll() }()
+
+		version = v
+		imagePath = tempImagePath
+	} else if !imagePath.IsDir() {
+		temp, err := updater.SetTempDir("extract-", tempDir)
+		if err != nil {
+			feedback.Fatal(i18n.Tr("error creating a temporary directory to extract the archive: %v", err), feedback.ErrBadArgument)
+		}
+		defer func() { _ = temp.RemoveAll() }()
+
+		// Check if there is enough free disk space before extracting an image
+		d, err := disk.Usage(temp.String())
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+		}
+		if d.Free/GiB < ExtractDiskSpace {
+			feedback.Fatal(i18n.Tr("extraction requires up to %d GiB of free space", ExtractDiskSpace), feedback.ErrBadArgument)
+		}
+
+		err = updater.ExtractImage(ctx, imagePath, temp)
+		if err != nil {
+			feedback.Fatal(i18n.Tr("error extracting the archive: %v", err), feedback.ErrBadArgument)
+		}
+
+		tempContent, err := temp.ReadDir(paths.AndFilter(paths.FilterDirectories(), paths.FilterPrefixes("arduino-unoq-debian-image-")))
+		if err != nil {
+			feedback.Fatal(i18n.Tr("could not find Debian image directory: %v", err), feedback.ErrBadArgument)
+		}
+
+		imagePath = tempContent[0]
+	}
+
+	err = updater.FlashBoard(ctx, imagePath.String(), version, func(target string) (bool, error) {
+		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)", target)
+
+		var yesInput string
+		_, err := fmt.Scanf("%s\n", &yesInput)
+		if err != nil {
+			return false, err
+		}
+		yes := strings.ToLower(yesInput) == "yes" || strings.ToLower(yesInput) == "y"
+		return yes, nil
+	}, forceYes)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error flashing the board: %v", err), feedback.ErrBadArgument)
 	}

updater/flasher.go

@@ -19,97 +19,14 @@ import (
 	"context"
 	"fmt"
 	"runtime"
-	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"github.com/shirou/gopsutil/v4/disk"
 
 	"github.com/arduino/arduino-flasher-cli/feedback"
 	"github.com/arduino/arduino-flasher-cli/i18n"
 	"github.com/arduino/arduino-flasher-cli/updater/artifacts"
 )
 
-const GiB = uint64(1024 * 1024 * 1024)
-const DownloadDiskSpace = uint64(12)
-const ExtractDiskSpace = uint64(10)
-
-func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes bool, tempDir string) error {
-	if !imagePath.Exist() {
-		client := NewClient()
-
-		temp, err := SetTempDir("download-", tempDir)
-		if err != nil {
-			return fmt.Errorf("error creating a temporary directory to extract the archive: %v", err)
-		}
-		defer func() { _ = temp.RemoveAll() }()
-
-		// Check if there is enough free disk space before downloading and extracting an image
-		d, err := disk.Usage(temp.String())
-		if err != nil {
-			return err
-		}
-		if d.Free/GiB < DownloadDiskSpace {
-			return fmt.Errorf("download and extraction requires up to %d GiB of free space", DownloadDiskSpace)
-		}
-
-		tempImagePath, v, err := DownloadAndExtract(ctx, client, version, temp)
-
-		if err != nil {
-			return fmt.Errorf("could not download and extract the image: %v", err)
-		}
-
-		// Download not confirmed
-		if tempImagePath == nil {
-			return nil
-		}
-
-		defer func() { _ = tempImagePath.Parent().RemoveAll() }()
-
-		version = v
-		imagePath = tempImagePath
-	} else if !imagePath.IsDir() {
-		temp, err := SetTempDir("extract-", tempDir)
-		if err != nil {
-			return fmt.Errorf("error creating a temporary directory to extract the archive: %v", err)
-		}
-		defer func() { _ = temp.RemoveAll() }()
-
-		// Check if there is enough free disk space before extracting an image
-		d, err := disk.Usage(temp.String())
-		if err != nil {
-			return err
-		}
-		if d.Free/GiB < ExtractDiskSpace {
-			return fmt.Errorf("extraction requires up to %d GiB of free space", ExtractDiskSpace)
-		}
-
-		err = ExtractImage(ctx, imagePath, temp)
-		if err != nil {
-			return fmt.Errorf("error extracting the archive: %v", err)
-		}
-
-		tempContent, err := temp.ReadDir(paths.AndFilter(paths.FilterDirectories(), paths.FilterPrefixes("arduino-unoq-debian-image-")))
-		if err != nil {
-			return fmt.Errorf("could not find Debian image directory: %v", err)
-		}
-
-		imagePath = tempContent[0]
-	}
-
-	return FlashBoard(ctx, imagePath.String(), version, func(target string) (bool, error) {
-		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)", target)
-
-		var yesInput string
-		_, err := fmt.Scanf("%s\n", &yesInput)
-		if err != nil {
-			return false, err
-		}
-		yes := strings.ToLower(yesInput) == "yes" || strings.ToLower(yesInput) == "y"
-		return yes, nil
-	}, forceYes)
-}
-
 func FlashBoard(ctx context.Context, downloadedImagePath string, version string, upgradeConfirmCb DownloadConfirmCB, forceYes bool) error {
 	if !forceYes {
 		res, err := upgradeConfirmCb(version)