From 47ea87b614fe3b2058f521c009c4bc55ad314a07 Mon Sep 17 00:00:00 2001 From: James Collins Date: Sun, 10 Sep 2023 20:11:22 +1000 Subject: [PATCH] improve upload progress indicator --- .../js/components/dialogs/SMDialogMedia.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/js/components/dialogs/SMDialogMedia.vue b/resources/js/components/dialogs/SMDialogMedia.vue index dac9e15..373bfb7 100644 --- a/resources/js/components/dialogs/SMDialogMedia.vue +++ b/resources/js/components/dialogs/SMDialogMedia.vue @@ -921,17 +921,17 @@ const computedUploadProgress = computed(() => { return 100; } - const totalProgress = items.reduce((accumulator, item) => { - if (item.jobs.length > 0) { - accumulator += - Math.floor( - (item.jobs[0].progress / item.jobs[0].progress_max) * 100, - ) || 100; - } - return accumulator; - }, 0); + let bytes = 0; + let maxBytes = 0; - return Math.floor(totalProgress / items.length); + items.forEach((item) => { + if (item.jobs.length > 0) { + bytes += item.jobs[0].progress; + maxBytes += item.jobs[0].progress_max; + } + }); + + return Math.floor((bytes / maxBytes) * 100); }); const getProcessingMediaItems = (): Media[] => {