From dc4cf5ae131698e6b0276b22e5d5d6e2a3a3230f Mon Sep 17 00:00:00 2001
From: Niko PLP <niko@nextgraph.org>
Date: Wed, 14 Aug 2024 17:17:51 +0300
Subject: [PATCH] fix file upload progress bar

---
 ng-app/src/apps/automerge/ADate.svelte |  2 +-
 ng-app/src/lib/panes/Files.svelte      | 78 +++++++++++++-------------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/ng-app/src/apps/automerge/ADate.svelte b/ng-app/src/apps/automerge/ADate.svelte
index 63b351c..e806ac7 100644
--- a/ng-app/src/apps/automerge/ADate.svelte
+++ b/ng-app/src/apps/automerge/ADate.svelte
@@ -36,7 +36,7 @@
     const change = (event) => { 
         
         let newval = new Date(date.split('/').reverse().join('/')+" "+time);
-        console.log(time, date, newval)
+        //console.log(time, date, newval)
        
         dispatch('updateScalar', {
             v: newval,
diff --git a/ng-app/src/lib/panes/Files.svelte b/ng-app/src/lib/panes/Files.svelte
index f146c10..8514337 100644
--- a/ng-app/src/lib/panes/Files.svelte
+++ b/ng-app/src/lib/panes/Files.svelte
@@ -65,7 +65,7 @@
     } 
 
     function uploadFile(upload_id, nuri, file, success) {
-        console.log(nuri);
+        //console.log(nuri);
         let chunkSize = 1_048_564;
         let fileSize = file.size;
         let offset = 0;
@@ -76,50 +76,48 @@
             let result = event.target.result;
 
             if (event.target.error == null) {
-            offset += result.byteLength;
-            upload_progress = { total: fileSize, current: offset };
-
-            // console.log("chunk", result);
-
-            let res = await ng.upload_chunk(
-                $active_session.session_id,
-                upload_id,
-                result,
-                nuri
-            );
-            //console.log("chunk upload res", res);
-            // if (onChunkRead) {
-            //   onChunkRead(result);
-            // }
+              offset += result.byteLength;
+              upload_progress = { total: fileSize, current: offset };
+
+              // console.log("chunk", result);
+
+              let res = await ng.upload_chunk(
+                  $active_session.session_id,
+                  upload_id,
+                  result,
+                  nuri
+              );
+              //console.log("chunk upload res", res);
+              // if (onChunkRead) {
+              //   onChunkRead(result);
+              // }
             } else {
-            // if (onChunkError) {
-            //   onChunkError(event.target.error);
-            // }
-            return;
+              // if (onChunkError) {
+              //   onChunkError(event.target.error);
+              // }
+              upload_progress = { total: fileSize, current: fileSize, error: true };
+              return;
             }
 
             // If finished:
             if (offset >= fileSize) {
-            //console.log("file uploaded");
-            let res = await ng.upload_chunk(
-                $active_session.session_id,
-                upload_id,
-                [],
-                nuri
-            );
-            //console.log("end upload res", res);
-            if (success) {
-                upload_progress = { total: fileSize, current: fileSize };
-                success(res);
-            } else {
-                upload_progress = { total: fileSize, current: fileSize, error: true };
-            }
-
-            // Make progress bar disappear
-            setTimeout(() => {
-                upload_progress = null;
-            }, 1_000);
-            return;
+              //console.log("file uploaded");
+              let res = await ng.upload_chunk(
+                  $active_session.session_id,
+                  upload_id,
+                  [],
+                  nuri
+              );
+              //console.log("end upload res", res);
+              if (success) {
+                  upload_progress = { total: fileSize, current: fileSize };
+                  await success(res);
+                  // Make progress bar disappear
+                  setTimeout(() => {
+                      upload_progress = null;
+                  }, 1_000);
+              } 
+              return;
             }
 
             readBlock(offset, chunkSize, file);