Merge branch 'feature/sc-133459/resume-downloads-from-s3' of github.c…

…om:particle-iot/particle-cli into feature/sc-133459/resume-downloads-from-s3
particle-iot · Jan 28, 2025 · 99392c4 · 99392c4
2 parents 8e89478 + 58d34b2
commit 99392c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/cmd/setup-tachyon.js b/src/cmd/setup-tachyon.js
@@ -29,7 +29,7 @@ module.exports = class SetupTachyonCommands extends CLICommandBase {
 		this._formatAndDisplaySteps = this._formatAndDisplaySteps.bind(this);
 	}
 
-	async setup({ skipFlashingOs, version, loadConfig, saveConfig }) {
+	async setup({ skip_flashing_os: skipFlashingOs, version, load_config: loadConfig, save_config: saveConfig }) {
 		try {
 			this.ui.write(`
 ===========================================================
@@ -82,7 +82,7 @@ Welcome to the Particle Tachyon setup! This interactive command:
 				);
 			} else {
 				this.ui.write(
-					`${os.EOL}${os.EOL}Skipping Step 3 - Using configuration file: ` + loadConfig + `${os.EOL}`
+					`${os.EOL}${os.EOL}Skipping to Step 3 - Using configuration file: ` + loadConfig + `${os.EOL}`
 				);
 			}
 

diff --git a/src/lib/qdl.js b/src/lib/qdl.js
@@ -100,11 +100,6 @@ class QdlFlasher {
 	}
 
 	processFlashingLogs(line) {
-		if (!this.preparingDownload) {
-			this.preparingDownload = true;
-			this.ui.stdout.write('Preparing for download...');
-		}
-
 		if (line.includes('status=getProgramInfo')) {
 			this.handleProgramInfo(line);
 		} else if (line.includes('status=Start flashing module')) {
@@ -115,6 +110,10 @@ class QdlFlasher {
 	}
 
 	handleProgramInfo(line) {
+		if (!this.preparingDownload) {
+			this.preparingDownload = true;
+			this.ui.stdout.write('Preparing to download files...');
+		}
 		const match = line.match(/sectors_total=(\d+)/);
 		if (match) {
 			this.totalSectorsInAllFiles += parseInt(match[1], 10);