Ewald
00d141ef8c
- Implemented size filters in the filesystem browser and added tests to ensure correct application of size constraints. - Updated write access guard tests to reflect changes in handling forwarded remote requests. - Introduced a new browser navigation controller to manage folder navigation and breadcrumb rendering. - Added regression tests to ensure proper binding order for asset manager and back navigation functionality. - Created tests to validate the absence of double reloads on folder context opening and the use of single folder keys in browser state. - Added various regression tests to ensure database integrity, asset metadata handling, and viewer functionality. - Enhanced tests for media filters and search scope to ensure correct behavior and data handling.
110 lines
5.1 KiB
JavaScript
110 lines
5.1 KiB
JavaScript
export function createGridController({ gridContainer, loadAssets, loadAssetsFromList, getCollectionAssets, disposeGrid, getQuery, state }) {
|
|
let _isReloading = false;
|
|
let _pendingReload = false;
|
|
const RELOAD_WATCHDOG_MS = 30000;
|
|
|
|
const runWithWatchdog = async (promiseFactory, timeoutMs = RELOAD_WATCHDOG_MS) => {
|
|
let timer = null;
|
|
try {
|
|
const timeoutPromise = new Promise((_, reject) => {
|
|
timer = setTimeout(() => {
|
|
const err = new Error(`Grid reload watchdog timeout (${timeoutMs}ms)`);
|
|
err.name = "GridReloadTimeout";
|
|
reject(err);
|
|
}, timeoutMs);
|
|
});
|
|
return await Promise.race([promiseFactory(), timeoutPromise]);
|
|
} finally {
|
|
if (timer) clearTimeout(timer);
|
|
}
|
|
};
|
|
|
|
const runReloadOnce = async () => {
|
|
// Expose the current query on the container so external listeners (ComfyUI executed events)
|
|
// can decide whether to do incremental upserts or avoid disrupting an active search.
|
|
try {
|
|
gridContainer.dataset.mjrQuery = String(getQuery?.() ?? "*") || "*";
|
|
} catch {}
|
|
gridContainer.dataset.mjrScope = state.scope;
|
|
gridContainer.dataset.mjrCustomRootId = state.customRootId || "";
|
|
const subfolder = state.currentFolderRelativePath || "";
|
|
gridContainer.dataset.mjrSubfolder = subfolder;
|
|
gridContainer.dataset.mjrFilterKind = state.kindFilter || "";
|
|
gridContainer.dataset.mjrFilterWorkflowOnly = state.workflowOnly ? "1" : "0";
|
|
gridContainer.dataset.mjrFilterMinRating = String(state.minRating || 0);
|
|
gridContainer.dataset.mjrFilterMinSizeMB = String(state.minSizeMB || 0);
|
|
gridContainer.dataset.mjrFilterMaxSizeMB = String(state.maxSizeMB || 0);
|
|
gridContainer.dataset.mjrFilterMinWidth = String(state.minWidth || 0);
|
|
gridContainer.dataset.mjrFilterMinHeight = String(state.minHeight || 0);
|
|
gridContainer.dataset.mjrFilterWorkflowType = String(state.workflowType || "");
|
|
gridContainer.dataset.mjrFilterDateRange = state.dateRangeFilter || "";
|
|
gridContainer.dataset.mjrFilterDateExact = state.dateExactFilter || "";
|
|
gridContainer.dataset.mjrSort = state.sort || "mtime_desc";
|
|
|
|
// Keep selection durable across re-renders by persisting it in the dataset
|
|
// (GridView re-applies selection as cards are created).
|
|
try {
|
|
const selected = Array.isArray(state.selectedAssetIds) ? state.selectedAssetIds.filter(Boolean).map(String) : [];
|
|
if (selected.length) {
|
|
gridContainer.dataset.mjrSelectedAssetIds = JSON.stringify(selected);
|
|
gridContainer.dataset.mjrSelectedAssetId = String(state.activeAssetId || selected[0] || "");
|
|
} else {
|
|
delete gridContainer.dataset.mjrSelectedAssetIds;
|
|
delete gridContainer.dataset.mjrSelectedAssetId;
|
|
}
|
|
} catch {}
|
|
|
|
if (state.scope === "custom" && !state.customRootId && !state.currentFolderRelativePath) {
|
|
try {
|
|
disposeGrid(gridContainer);
|
|
} catch {}
|
|
// Browser mode: no selected custom root required. Start at filesystem roots.
|
|
state.currentFolderRelativePath = "";
|
|
}
|
|
|
|
if (state.collectionId) {
|
|
const res = await getCollectionAssets?.(state.collectionId);
|
|
if (res?.ok && res.data && Array.isArray(res.data.assets)) {
|
|
const title = state.collectionName ? `Collection: ${state.collectionName}` : "Collection";
|
|
const result = await loadAssetsFromList(gridContainer, res.data.assets, { title, reset: true });
|
|
try {
|
|
state.lastGridCount = Number(result?.count || 0) || 0;
|
|
state.lastGridTotal = Number(result?.total || 0) || 0;
|
|
gridContainer.dispatchEvent?.(new CustomEvent("mjr:grid-stats", { detail: result || {} }));
|
|
} catch {}
|
|
return;
|
|
}
|
|
// If collection fetch fails, fall back to normal loading and clear the broken state.
|
|
state.collectionId = "";
|
|
state.collectionName = "";
|
|
}
|
|
|
|
const result = await loadAssets(gridContainer, getQuery());
|
|
try {
|
|
state.lastGridCount = Number(result?.count || 0) || 0;
|
|
state.lastGridTotal = Number(result?.total || 0) || 0;
|
|
gridContainer.dispatchEvent?.(new CustomEvent("mjr:grid-stats", { detail: result || {} }));
|
|
} catch {}
|
|
};
|
|
|
|
const reloadGrid = async () => {
|
|
_pendingReload = true;
|
|
if (_isReloading) return;
|
|
_isReloading = true;
|
|
try {
|
|
while (_pendingReload) {
|
|
_pendingReload = false;
|
|
try {
|
|
await runWithWatchdog(() => runReloadOnce());
|
|
} catch {
|
|
// Keep UI responsive even if one reload got stuck.
|
|
}
|
|
}
|
|
} finally {
|
|
_isReloading = false;
|
|
}
|
|
};
|
|
|
|
return { reloadGrid };
|
|
}
|