Refactor the flow of the commands to make them more readable

Author: MatteoPologruto

download.go

@@ -51,7 +51,7 @@ func runDownloadCommand(args []string, destDir string) {
 	}
 
 	client := updater.NewClient()
-	_, _, err := updater.DownloadImage(client, targetVersion, nil, true, "", downloadPath)
+	_, _, err := updater.DownloadImage(client, targetVersion, nil, true, downloadPath)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error downloading the image: %v", err), feedback.ErrBadArgument)
 	}

updater/download_image.go

@@ -27,15 +27,11 @@ import (
 	"github.com/arduino/go-paths-helper"
 	"github.com/codeclysm/extract/v4"
 	"github.com/schollz/progressbar/v3"
-	"github.com/shirou/gopsutil/v4/disk"
 
 	"github.com/arduino/arduino-flasher-cli/feedback"
 	"github.com/arduino/arduino-flasher-cli/i18n"
 )
 
-const GiB = uint64(1024 * 1024 * 1024)
-const NeededDiskSpace = uint64(15)
-
 type Manifest struct {
 	Latest   Release   `json:"latest"`
 	Releases []Release `json:"releases"`
@@ -50,8 +46,8 @@ type Release struct {
 // DownloadConfirmCB is a function that is called when a Debian image is ready to be downloaded.
 type DownloadConfirmCB func(target string) (bool, error)
 
-func DownloadAndExtract(client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, tempDir string) (*paths.Path, string, error) {
-	tmpZip, version, err := DownloadImage(client, targetVersion, upgradeConfirmCb, forceYes, tempDir, nil)
+func DownloadAndExtract(client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, temp *paths.Path) (*paths.Path, string, error) {
+	tmpZip, version, err := DownloadImage(client, targetVersion, upgradeConfirmCb, forceYes, temp)
 	if err != nil {
 		return nil, "", fmt.Errorf("error downloading the image: %v", err)
 	}
@@ -73,7 +69,7 @@ func DownloadAndExtract(client *Client, targetVersion string, upgradeConfirmCb D
 	return imagePath, version, nil
 }
 
-func DownloadImage(client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, tempDir string, downloadPath *paths.Path) (*paths.Path, string, error) {
+func DownloadImage(client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, downloadPath *paths.Path) (*paths.Path, string, error) {
 	var err error
 
 	feedback.Print(i18n.Tr("Checking for Debian image releases"))
@@ -115,14 +111,6 @@ func DownloadImage(client *Client, targetVersion string, upgradeConfirmCb Downlo
 	}
 	defer download.Close()
 
-	// Download the zip
-	if downloadPath == nil {
-		downloadPath, err = SetTempDir("download-", tempDir)
-		if err != nil {
-			return nil, "", fmt.Errorf("could not create temporary download directory: %w", err)
-		}
-	}
-
 	tmpZip := downloadPath.Join("arduino-unoq-debian-image-" + rel.Version + ".tar.zst")
 	tmpZipFile, err := tmpZip.Create()
 	if err != nil {
@@ -191,14 +179,5 @@ func SetTempDir(prefix string, tempDir string) (*paths.Path, error) {
 		return nil, fmt.Errorf("could not create .cache directory: %w", err)
 	}
 
-	// Check if there is enough free disk space before downloading/extracting an image
-	d, err := disk.Usage(temp.String())
-	if err != nil {
-		return nil, err
-	}
-	if d.Free/GiB < NeededDiskSpace {
-		return nil, fmt.Errorf("aborting: download and extraction requires up to %d GiB of free space", NeededDiskSpace)
-	}
-
 	return temp, nil
 }

updater/flasher.go

@@ -22,16 +22,36 @@ import (
 	"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(client, version, func(target string) (bool, error) {
 			feedback.Printf("Found Debian image version: %s", target)
 			feedback.Printf("Do you want to download it? (yes/no)")
@@ -43,7 +63,7 @@ func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes
 			}
 			yes := strings.ToLower(yesInput) == "yes" || strings.ToLower(yesInput) == "y"
 			return yes, nil
-		}, forceYes, tempDir)
+		}, forceYes, temp)
 
 		if err != nil {
 			return fmt.Errorf("could not download and extract the image: %v", err)
@@ -65,6 +85,15 @@ func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes
 		}
 		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(imagePath, temp)
 		if err != nil {
 			return fmt.Errorf("error extracting the archive: %v", err)