Fix the asset check code

particle-iot · Apr 15, 2024 · 70babcd · 70babcd
1 parent 79046f7
commit 70babcd
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/lib/flash-helper.js b/src/lib/flash-helper.js
@@ -66,6 +66,12 @@ async function _flashDeviceInNormalMode(device, data, { name, progress, checkSki
 				}
 				return device;
 			}
+			try {
+				await device.enterListeningMode();
+				await delay(1000); // Just in case
+			} catch (error) {
+				// ignore
+			}
 			await device.updateFirmware(data, { progress, timeout: FLASH_TIMEOUT });
 			return device;
 		} catch (error) {
@@ -90,12 +96,6 @@ async function prepareDeviceForFlash({ device, mode, progress }) {
 				}
 				device = await usbUtils.reopenInNormalMode(device, { reset: true });
 			}
-			try {
-				await device.enterListeningMode();
-				await delay(1000); // Just in case
-			} catch (error) {
-				// ignore
-			}
 			break;
 		case 'dfu':
 			if (!device.isInDfuMode) {
@@ -332,8 +332,9 @@ async function createFlashSteps({ modules, isInDfuMode, factory, platformId }) {
 }
 
 function _skipAsset(module, existingAssets) {
+	const name = path.basename(module.filename);
 	const hashAssetToBeFlashed = _get256Hash(module);
-	return existingAssets.some((asset) => hashAssetToBeFlashed === asset.hash && module.filename === asset.name);
+	return existingAssets.some((asset) => hashAssetToBeFlashed === asset.hash && name === asset.name);
 }
 
 function _get256Hash(module) {