Remove callback function and download archives automatically

Author: MatteoPologruto

download.go

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

updater/download_image.go

@@ -46,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(ctx context.Context, client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, temp *paths.Path) (*paths.Path, string, error) {
-	tmpZip, version, err := DownloadImage(ctx, client, targetVersion, upgradeConfirmCb, forceYes, temp)
+func DownloadAndExtract(ctx context.Context, client *Client, targetVersion string, temp *paths.Path) (*paths.Path, string, error) {
+	tmpZip, version, err := DownloadImage(ctx, client, targetVersion, temp)
 	if err != nil {
 		return nil, "", fmt.Errorf("error downloading the image: %v", err)
 	}
@@ -69,7 +69,7 @@ func DownloadAndExtract(ctx context.Context, client *Client, targetVersion strin
 	return imagePath, version, nil
 }
 
-func DownloadImage(ctx context.Context, client *Client, targetVersion string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, downloadPath *paths.Path) (*paths.Path, string, error) {
+func DownloadImage(ctx context.Context, client *Client, targetVersion string, downloadPath *paths.Path) (*paths.Path, string, error) {
 	var err error
 
 	feedback.Print(i18n.Tr("Checking for Debian image releases"))
@@ -94,17 +94,6 @@ func DownloadImage(ctx context.Context, client *Client, targetVersion string, up
 		return nil, "", fmt.Errorf("could not find Debian image %s", targetVersion)
 	}
 
-	if !forceYes {
-		res, err := upgradeConfirmCb(rel.Version)
-		if err != nil {
-			return nil, "", err
-		}
-		if !res {
-			feedback.Print(i18n.Tr("Download not confirmed by user, exiting"))
-			return nil, "", nil
-		}
-	}
-
 	download, size, err := client.FetchZip(ctx, rel.Url)
 	if err != nil {
 		return nil, "", fmt.Errorf("could not fetch Debian image: %w", err)

updater/flasher.go

@@ -52,18 +52,7 @@ func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes
 			return fmt.Errorf("download and extraction requires up to %d GiB of free space", DownloadDiskSpace)
 		}
 
-		tempImagePath, v, err := DownloadAndExtract(ctx, 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)")
-
-			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, temp)
+		tempImagePath, v, err := DownloadAndExtract(ctx, client, version, temp)
 
 		if err != nil {
 			return fmt.Errorf("could not download and extract the image: %v", err)