Add logic to preserve user partition

Author: MatteoPologruto

flash.go

@@ -30,7 +30,7 @@ import (
 )
 
 func newFlashCmd() *cobra.Command {
-	var forceYes bool
+	var forceYes, preserveUser bool
 	appCmd := &cobra.Command{
 		Use:   "flash",
 		Short: "Flash a Debian image on the board",
@@ -66,11 +66,11 @@ NOTE: On Windows, required drivers are automatically installed with elevated pri
 		Args: cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			checkDriversInstalled()
-			runFlashCommand(cmd.Context(), args, forceYes)
+			runFlashCommand(cmd.Context(), args, forceYes, preserveUser)
 		},
 	}
 	appCmd.Flags().BoolVarP(&forceYes, "yes", "y", false, "Automatically confirm all prompts")
-	// TODO: add --clean-install flag or something similar to distinguish between keeping and purging the /home directory
+	appCmd.Flags().BoolVar(&preserveUser, "preserve-user", false, "Preserve user partition")
 
 	return appCmd
 }
@@ -86,13 +86,13 @@ func checkDriversInstalled() {
 	}
 }
 
-func runFlashCommand(ctx context.Context, args []string, forceYes bool) {
+func runFlashCommand(ctx context.Context, args []string, forceYes bool, preserveUser bool) {
 	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)
+	err = updater.Flash(ctx, imagePath, args[0], forceYes, preserveUser)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error flashing the board: %v", err), feedback.ErrBadArgument)
 	}

updater/flasher.go

@@ -28,7 +28,7 @@ import (
 	"github.com/arduino/arduino-flasher-cli/updater/artifacts"
 )
 
-func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes bool) error {
+func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes bool, preserveUser bool) error {
 	if !imagePath.Exist() {
 		client := NewClient()
 
@@ -89,10 +89,10 @@ func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes
 		}
 		yes := strings.ToLower(yesInput) == "yes" || strings.ToLower(yesInput) == "y"
 		return yes, nil
-	}, forceYes)
+	}, forceYes, preserveUser)
 }
 
-func FlashBoard(ctx context.Context, downloadedImagePath string, version string, upgradeConfirmCb DownloadConfirmCB, forceYes bool) error {
+func FlashBoard(ctx context.Context, downloadedImagePath string, version string, upgradeConfirmCb DownloadConfirmCB, forceYes bool, preserveUser bool) error {
 	if !forceYes {
 		res, err := upgradeConfirmCb(version)
 		if err != nil {
@@ -139,9 +139,14 @@ func FlashBoard(ctx context.Context, downloadedImagePath string, version string,
 	if err != nil {
 		return err
 	}
-	// TODO: add logic to preserve the user partition
+
+	rawProgram := "rawprogram0.xml"
+	if preserveUser {
+		rawProgram = "rawprogram0.nouser.xml"
+	}
+
 	feedback.Print(i18n.Tr("Flashing with qdl"))
-	cmd, err := paths.NewProcess(nil, qdlPath.String(), "--allow-missing", "--storage", "emmc", "prog_firehose_ddr.elf", "rawprogram0.xml", "patch0.xml")
+	cmd, err := paths.NewProcess(nil, qdlPath.String(), "--allow-missing", "--storage", "emmc", "prog_firehose_ddr.elf", rawProgram, "patch0.xml")
 	if err != nil {
 		return err
 	}