From 0de7a87938e8307a7f5794281d29e022c8761207 Mon Sep 17 00:00:00 2001
From: nobswebdev <nobswebdev@noreply.git.nobswebdev.com>
Date: Tue, 3 Nov 2026 18:19:20 +0100
Subject: [PATCH] Share axios download percent helper for ExifTool WASM.

Use entry.message for metadata initializing status instead of hardcoded copy.
---
 .../src/components/upload/UploadQueueList.vue |  4 +--
 .../utils/percentFromAxiosProgress.spec.ts    | 26 +++++++++++++++++++
 .../src/utils/percentFromAxiosProgress.ts     | 11 ++++++++
 frontend/src/workers/exiftoolWorker.ts        | 11 ++++----
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/utils/percentFromAxiosProgress.spec.ts
 create mode 100644 frontend/src/utils/percentFromAxiosProgress.ts

diff --git a/frontend/src/components/upload/UploadQueueList.vue b/frontend/src/components/upload/UploadQueueList.vue
index f089d8a..0d254df 100644
--- a/frontend/src/components/upload/UploadQueueList.vue
+++ b/frontend/src/components/upload/UploadQueueList.vue
@@ -97,10 +97,10 @@ const formatMetadataPreviewMessage = (entry: MetadataPreviewEntry): string => {
         const percent = wasmDownloadPercent.value;
 
         if (percent === null) {
-            return 'Downloading ExifTool…';
+            return entry.message;
         }
 
-        return `Downloading ExifTool… ${percent}%`;
+        return `${entry.message} ${percent}%`;
     }
 
     return entry.message;
diff --git a/frontend/src/utils/percentFromAxiosProgress.spec.ts b/frontend/src/utils/percentFromAxiosProgress.spec.ts
new file mode 100644
index 0000000..7fa2a81
--- /dev/null
+++ b/frontend/src/utils/percentFromAxiosProgress.spec.ts
@@ -0,0 +1,26 @@
+import type { AxiosProgressEvent } from 'axios';
+import { describe, expect, it } from 'vitest';
+import { percentFromAxiosProgress } from '@/utils/percentFromAxiosProgress';
+
+const progress = (loaded: number, total?: number): AxiosProgressEvent =>
+    ({
+        loaded,
+        total,
+        bytes: 0,
+        lengthComputable: total !== undefined
+    }) as AxiosProgressEvent;
+
+describe('percentFromAxiosProgress', () => {
+    it('returns null when total is missing', () => {
+        expect(percentFromAxiosProgress(progress(50))).toBeNull();
+    });
+
+    it('returns rounded percent from loaded and total', () => {
+        expect(percentFromAxiosProgress(progress(250, 1000))).toBe(25);
+        expect(percentFromAxiosProgress(progress(1, 3))).toBe(33.33);
+    });
+
+    it('caps at 100', () => {
+        expect(percentFromAxiosProgress(progress(200, 100))).toBe(100);
+    });
+});
diff --git a/frontend/src/utils/percentFromAxiosProgress.ts b/frontend/src/utils/percentFromAxiosProgress.ts
new file mode 100644
index 0000000..2b38d71
--- /dev/null
+++ b/frontend/src/utils/percentFromAxiosProgress.ts
@@ -0,0 +1,11 @@
+import type { AxiosProgressEvent } from 'axios';
+
+export const percentFromAxiosProgress = (progressEvent: AxiosProgressEvent): number | null => {
+    if (!progressEvent.total) {
+        return null;
+    }
+
+    const percent = Math.min(100, (progressEvent.loaded / progressEvent.total) * 100);
+
+    return parseFloat(percent.toFixed(2));
+};
diff --git a/frontend/src/workers/exiftoolWorker.ts b/frontend/src/workers/exiftoolWorker.ts
index 3ce8d18..5d27c8b 100644
--- a/frontend/src/workers/exiftoolWorker.ts
+++ b/frontend/src/workers/exiftoolWorker.ts
@@ -4,6 +4,7 @@ import axios from 'axios';
 import { EXIFTOOL_WORKER_INIT_JPEG } from '@/consts/exiftoolWorkerInitJpeg';
 import type { ExiftoolWorkerInMessage } from '@/types/workers/exiftoolWorkerInMessage';
 import type { ExiftoolWorkerJob } from '@/types/workers/exiftoolWorkerJob';
+import { percentFromAxiosProgress } from '@/utils/percentFromAxiosProgress';
 import { resolveErrorMessage } from '@/utils/resolveErrorMessage';
 import { toArrayBuffer } from '@/utils/toArrayBuffer';
 
@@ -18,15 +19,13 @@ const fetchZeroperlWasm = async (): Promise<Response> => {
         const { data } = await axios.get<ArrayBuffer>(zeroperlWasmUrl, {
             responseType: 'arraybuffer',
             onDownloadProgress: progressEvent => {
-                if (!progressEvent.total) {
+                const percent = percentFromAxiosProgress(progressEvent);
+
+                if (percent === null) {
                     return;
                 }
 
-                const percent = Math.min(100, (progressEvent.loaded / progressEvent.total) * 100);
-
-                const rounded = parseFloat(percent.toFixed(2));
-
-                self.postMessage({ type: 'wasm-download-progress', percent: rounded });
+                self.postMessage({ type: 'wasm-download-progress', percent });
             }
         });