Fix update function returning a smaller value for totalBytes than wri…

…tten (#112) Co-authored-by: Paulus Schoutsen <[email protected]>
NabuCasa · Apr 7, 2022 · e93a2a9 · e93a2a9
1 parent beda67d
commit e93a2a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/script.js b/js/script.js
@@ -300,9 +300,9 @@ async function clickProgram() {
       const progressBar = progress[file].querySelector("div");
       await espStub.flashData(
         contents,
-        (bytesWritten) => {
+        (bytesWritten, totalBytes) => {
           progressBar.style.width =
-            Math.floor((bytesWritten / contents.byteLength) * 100) + "%";
+            Math.floor((bytesWritten / totalBytes) * 100) + "%";
         },
         offset
       );

diff --git a/src/esp_loader.ts b/src/esp_loader.ts
@@ -618,7 +618,7 @@ export class ESPLoader extends EventTarget {
         ? Math.round((block.length * uncompressedFilesize) / compressedFilesize)
         : block.length;
       position += flashWriteSize;
-      updateProgress(written, filesize);
+      updateProgress(Math.min(written, filesize), filesize);
     }
     this.logger.log(
       "Took " + (Date.now() - stamp) + "ms to write " + filesize + " bytes"