From 236ca637f99e373adfeaaefc5db6af50bd15b6bf Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Sun, 28 Apr 2024 14:40:24 -0400
Subject: [PATCH] feat: Display Upload Progress as Percentage and File Size /
 Total File Size (#3111)

---
 .../src/components/prompts/UploadFiles.vue    | 16 +++++++--
 frontend/src/stores/upload.ts                 | 34 +++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/prompts/UploadFiles.vue b/frontend/src/components/prompts/UploadFiles.vue
index 88a0b607..48a9e1d4 100644
--- a/frontend/src/components/prompts/UploadFiles.vue
+++ b/frontend/src/components/prompts/UploadFiles.vue
@@ -10,6 +10,12 @@
         <div class="upload-info">
           <div class="upload-speed">{{ uploadSpeed.toFixed(2) }} MB/s</div>
           <div class="upload-eta">{{ formattedETA }} remaining</div>
+          <div class="upload-percentage">
+            {{ getProgressDecimal }}% Completed
+          </div>
+          <div class="upload-fraction">
+            {{ getTotalProgressBytes }} / {{ getTotalSize }}
+          </div>
         </div>
         <button
           class="action"
@@ -72,6 +78,10 @@ export default {
       "filesInUploadCount",
       "uploadSpeed",
       "getETA",
+      "getProgress",
+      "getProgressDecimal",
+      "getTotalProgressBytes",
+      "getTotalSize",
     ]),
     ...mapWritableState(useFileStore, ["reload"]),
     formattedETA() {
@@ -91,7 +101,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions(useUploadStore, ["reset"]),  // Mapping reset action from upload store
+    ...mapActions(useUploadStore, ["reset"]), // Mapping reset action from upload store
     toggle: function () {
       this.open = !this.open;
     },
@@ -100,8 +110,8 @@ export default {
         abortAllUploads();
         buttons.done("upload");
         this.open = false;
-        this.reset();  // Resetting the upload store state
-        this.reload = true;  // Trigger reload in the file store
+        this.reset(); // Resetting the upload store state
+        this.reload = true; // Trigger reload in the file store
       }
     },
   },
diff --git a/frontend/src/stores/upload.ts b/frontend/src/stores/upload.ts
index 7a7686a6..4e814454 100644
--- a/frontend/src/stores/upload.ts
+++ b/frontend/src/stores/upload.ts
@@ -13,6 +13,15 @@ const beforeUnload = (event: Event) => {
   // event.returnValue = "";
 };
 
+// Utility function to format bytes into a readable string
+function formatSize(bytes: number): string {
+  if (bytes === 0) return "0 Bytes";
+
+  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+  const i = Math.floor(Math.log(bytes) / Math.log(1024));
+  return parseFloat((bytes / Math.pow(1024, i)).toFixed(2)) + " " + sizes[i];
+}
+
 export const useUploadStore = defineStore("upload", {
   // convert to a function
   state: (): {
@@ -47,6 +56,31 @@ export const useUploadStore = defineStore("upload", {
       const sum = state.progress.reduce((acc, val) => +acc + +val) as number;
       return Math.ceil((sum / totalSize) * 100);
     },
+    getProgressDecimal: (state) => {
+      if (state.progress.length === 0) {
+        return 0;
+      }
+
+      const totalSize = state.sizes.reduce((a, b) => a + b, 0);
+
+      // TODO: this looks ugly but it works with ts now
+      const sum = state.progress.reduce((acc, val) => +acc + +val) as number;
+      return ((sum / totalSize) * 100).toFixed(2);
+    },
+    getTotalProgressBytes: (state) => {
+      if (state.progress.length === 0 || state.sizes.length === 0) {
+        return "0 Bytes";
+      }
+      const sum = state.progress.reduce((acc, val) => +acc + +val, 0) as number;
+      return formatSize(sum);
+    },
+    getTotalSize: (state) => {
+      if (state.sizes.length === 0) {
+        return "0 Bytes";
+      }
+      const totalSize = state.sizes.reduce((a, b) => a + b, 0);
+      return formatSize(totalSize);
+    },
     filesInUploadCount: (state) => {
       return Object.keys(state.uploads).length + state.queue.length;
     },