nodes/co5dt-ComfyUI-Persistent-Queue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor progress calculation and update logic

Browse Source
This commit is contained in:
Simon Cordt
2025-09-24 08:23:06 +02:00
parent 5998748253
commit 0f9475ee1d
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pqueue.js
+24 -22
View File
@@ -33,6 +33,27 @@
return e;
}
// Progress helpers
function computeAggregateProgress(nodes) {
let totalMax = 0;
let totalVal = 0;
Object.values(nodes || {}).forEach((st) => {
const mv = Math.max(1, Number((st && st.max) || 1));
const vv = Math.max(0, Math.min(Number((st && st.value) || 0), mv));
totalMax += mv;
totalVal += vv;
});
return totalMax > 0 ? Math.max(0, Math.min(1, totalVal / totalMax)) : 0;
}
function updateProgressBarsFromState() {
if (!state.container) return;
Object.entries(state.running_progress).forEach(([pid, f]) => {
const bar = state.container.querySelector(`.pqueue-item[data-id="${pid}"] .pqueue-progress-bar`);
if (bar) bar.style.width = `${(Number(f) * 100).toFixed(2)}%`;
});
}
function ensureThemeLink() {
if (!document.getElementById('pqueue-style-link')) {
const link = document.createElement('link');
@@ -153,6 +174,7 @@
state.container.appendChild(root);
wireHandlers();
updateProgressBarsFromState();
}
function wireHandlers() {
@@ -359,28 +381,8 @@
try {
const payload = ev && ev.detail ? ev.detail : ev;
if (!payload || !payload.prompt_id || !payload.nodes) return;
let totalMax = 0;
let totalVal = 0;
Object.values(payload.nodes).forEach((st) => {
const mv = Math.max(1, Number((st && st.max) || 1));
const vv = Math.max(0, Math.min(Number((st && st.value) || 0), mv));
totalMax += mv;
totalVal += vv;
});
const frac = totalMax > 0 ? Math.max(0, Math.min(1, totalVal / totalMax)) : 0;
state.running_progress[payload.prompt_id] = frac;
// Lightweight re-render: only update bars if present, otherwise full render
if (state.container) {
const bars = state.container.querySelectorAll('.pqueue-item[data-id] .pqueue-progress-bar');
if (bars && bars.length) {
Object.entries(state.running_progress).forEach(([pid, f]) => {
const li = state.container.querySelector(`.pqueue-item[data-id="${pid}"] .pqueue-progress-bar`);
if (li) li.style.width = `${(Number(f) * 100).toFixed(2)}%`;
});
} else {
render();
}
}
state.running_progress[payload.prompt_id] = computeAggregateProgress(payload.nodes);
updateProgressBarsFromState();
} catch(e) { /* ignore */ }
};