From b75f4fc41a51c46be081f38a0cc958861726db39 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Fri, 29 Mar 2024 20:43:35 +0000
Subject: [PATCH] Display upload progress as file size / total file size during
 uploads

---
 frontend/src/api/tus.js                       |  8 ++++++++
 .../src/components/prompts/UploadFiles.vue    | 19 ++++++++++++++++++-
 frontend/src/store/getters.js                 |  4 +++-
 frontend/src/store/modules/upload.js          |  4 +++-
 frontend/src/store/mutations.js               |  8 ++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/tus.js b/frontend/src/api/tus.js
index 9764a532..4bae833d 100644
--- a/frontend/src/api/tus.js
+++ b/frontend/src/api/tus.js
@@ -28,6 +28,8 @@ export async function upload(
   let resourcePath = `${tusEndpoint}${filePath}?override=${overwrite}`;
 
   await createUpload(resourcePath);
+  let uploadSize = content.size || 0; // Get the size of the content being uploaded
+  store.commit('setTotalFileSize', store.state.upload.totalFileSize + uploadSize);
 
   return new Promise((resolve, reject) => {
     let upload = new tus.Upload(content, {
@@ -182,6 +184,12 @@ function calcProgress(filePath) {
   store.commit("setETA", eta);
   store.commit("setUploadPercentage", uploadPercentage);
 
+  let totalUploaded = 0;
+  for (let file in CURRENT_UPLOAD_LIST) {
+    totalUploaded += CURRENT_UPLOAD_LIST[file].currentBytesUploaded;
+  }
+  store.commit('setTotalUploadedSize', totalUploaded);
+
   fileData.initialBytesUploaded = fileData.currentBytesUploaded;
   fileData.lastProgressTimestamp = Date.now();
 }
diff --git a/frontend/src/components/prompts/UploadFiles.vue b/frontend/src/components/prompts/UploadFiles.vue
index ef67c374..5261566d 100644
--- a/frontend/src/components/prompts/UploadFiles.vue
+++ b/frontend/src/components/prompts/UploadFiles.vue
@@ -11,6 +11,10 @@
           <div class="upload-speed">{{ uploadSpeed.toFixed(2) }} MB/s</div>
           <div class="upload-eta">{{ formattedETA }} remaining</div>
           <div class="upload-percentage">{{ uploadPercentage.toFixed(2) }}%</div>
+          <div class="upload-size">
+            {{ formatFileSize(totalUploadedSize) }} /
+            {{ formatFileSize(totalFileSize) }}
+          </div>
         </div>
         <button
           class="action"
@@ -71,7 +75,9 @@ export default {
       "filesInUploadCount",
       "uploadSpeed",
       "eta",
-      "uploadPercentage"
+      "uploadPercentage",
+      "totalUploadedSize",
+      "totalFileSize",
     ]),
     ...mapMutations(["resetUpload"]),
     formattedETA() {
@@ -103,6 +109,17 @@ export default {
         this.$store.commit("setReload", true);
       }
     },
+    formatFileSize(size) {
+      if (size < 1024) {
+        return size + ' B';
+      } else if (size < 1024 * 1024) {
+        return (size / 1024).toFixed(2) + ' KB';
+      } else if (size < 1024 * 1024 * 1024) {
+        return (size / 1024 / 1024).toFixed(2) + ' MB';
+      } else {
+        return (size / 1024 / 1024 / 1024).toFixed(2) + ' GB';
+      }
+    },
   },
 };
 </script>
diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js
index bc85146d..1c7ce47e 100644
--- a/frontend/src/store/getters.js
+++ b/frontend/src/store/getters.js
@@ -51,7 +51,9 @@ const getters = {
   },
   uploadSpeed: (state) => state.upload.speedMbyte,
   eta: (state) => state.upload.eta,
-  uploadPercentage: (state) => state.upload.uploadPercentage
+  uploadPercentage: (state) => state.upload.uploadPercentage,
+  totalUploadedSize: (state) => state.upload.totalUploadedSize,
+  totalFileSize: (state) => state.upload.totalFileSize
 };
 
 export default getters;
diff --git a/frontend/src/store/modules/upload.js b/frontend/src/store/modules/upload.js
index 27cd3367..29c15ec1 100644
--- a/frontend/src/store/modules/upload.js
+++ b/frontend/src/store/modules/upload.js
@@ -13,7 +13,9 @@ const state = {
   uploads: {},
   speedMbyte: 0,
   eta: 0,
-  uploadPercentage: 0
+  uploadPercentage: 0,
+  totalFileSize: 0,
+  totalUploadedSize: 0
 };
 
 const mutations = {
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
index 0b946cdd..f78d713c 100644
--- a/frontend/src/store/mutations.js
+++ b/frontend/src/store/mutations.js
@@ -107,6 +107,12 @@ const mutations = {
   setUploadPercentage(state, value) {
     state.upload.uploadPercentage = value;
   },
+  setTotalUploadedSize(state, value) {
+    state.upload.totalUploadedSize = value;
+  },
+  setTotalFileSize(state, value) {
+    state.upload.totalFileSize = value;
+  },
   resetUpload(state) {
     state.upload.uploads = {};
     state.upload.queue = [];
@@ -116,6 +122,8 @@ const mutations = {
     state.upload.speedMbyte = 0;
     state.upload.eta = 0;
     state.upload.uploadPercentage = 0;
+    state.upload.totalFileSize = 0;
+    state.upload.totalUploadedSize = 0;
   },
 };