Skip to content

best way to save what you love

web/ProcessingQueue: use full progress per item, not just running task

wukko2ae0fd01dde0
diff --git a/web/src/components/queue/ProcessingQueue.svelte b/web/src/components/queue/ProcessingQueue.svelte
index 2d9e0915..8535f58e 100644
--- a/web/src/components/queue/ProcessingQueue.svelte
+++ b/web/src/components/queue/ProcessingQueue.svelte
@@ -19,11 +19,20 @@
$: queue = Object.entries($readableQueue);
+ const totalItemProgress = (completed: number, current: number, total: number) => {
+ return (completed * 100 + current) / total
+ }
+
$: totalProgress = queue.length ? queue.map(([, item]) => {
- if (item.state === "done" || item.state === "error")
+ if (item.state === "done" || item.state === "error") {
return 100;
- else if (item.state === "running")
- return $currentTasks[item.runningWorker]?.progress?.percentage || 0;
+ } else if (item.state === "running") {
+ return totalItemProgress(
+ item.completedWorkers?.length || 0,
+ $currentTasks[item.runningWorker]?.progress?.percentage || 0,
+ item.pipeline.length || 0
+ );
+ }
return 0;
}).reduce((a, b) => a + b) / (100 * queue.length) : 0;