mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-10-08 10:32:13 -03:00
Refreshing had no way to say "scan only this drive": a user with three external
drives had to spin all of them up for every refresh, and switching a drive off
made the next refresh treat its whole library as deleted (rows pruned from the
memory cache and the SQLite cache, preview_url stripped on the next scroll).
Backend (py/services/model_scanner.py, py/config.py):
* ReconcileScope(roots, folder) + _reconcile_cache(scope=...): files inside the
scope reconcile normally, everything outside is neither re-read nor removed.
The folder half is plumbing for the sidebar entry in the next change.
* Path-level pruning guard: cached entries under a path this walk could not
read are kept and reported instead of removed. Sources: a configured root that
is not reachable (drive switched off while LM runs), a directory os.walk
failed to enter (permissions / I/O error / Windows junction to an offline
drive), and a known first-level symlink whose target is gone
(Config.iter_path_mappings()).
* The recorded folder list is unioned instead of replaced whenever the scan did
not verify every root, so a scoped scan cannot empty the sidebar.
* _reconcile_cache returns a summary (added / removed / repaired /
scanned_roots / skipped_roots / unavailable_paths / kept_unreachable),
exposed as ModelScanner.last_reconcile_summary, returned by
BaseModelService.scan_models() and broadcast in the completed WS payload.
* _root_display_labels(): set-aware labels ("G: loras", "usb/loras") grown
leftwards with real parent segments until unique, shared by the walk-progress
line and the roots API.
* GET /scan accepts repeated `roots` (400 for unknown roots, 400 combined with
full_rebuild=true); GET /roots gains root_details (label / reachable / cached
count) while `roots` stays a plain path list for existing callers.
* serve_preview: a 404 no longer clears the cached preview_url when the file's
own directory is unreachable - browsing the grid with a drive off used to
strip preview references from the persistent cache.
Frontend:
* Refresh ▾ gains a "Scan one folder" section listing the page's roots with
their cached counts; offline roots stay clickable and explain themselves; rows
are wired by delegation (new static/js/components/controls/ScanScopeMenu.js).
* A scoped scan reports "Scanned <root>: N new, M removed"; a scan that kept
entries reports "<N> models kept: <paths> not reachable".
* registerAPI() now injects the two cross-page passthroughs (fetchModelRoots and
an argument-forwarding refreshModels) so a page facade cannot drop them: the
first version rendered an empty menu and would have run a full refresh.
* createToastElement whitelists toast types, so a wrong `type` argument degrades
to the info style instead of rendering an unstyled box.
Verified in a sandbox instance with three roots: a scoped scan walks only the
requested root (progress roots=0/1, 240 files); a full refresh with one root
offline reports kept_unreachable=60 and leaves all 420 models cached; /roots
reports the offline root with its cached count. 3699 passed, 7 skipped;
frontend 1488 passed (148 files); vue widgets 96 passed.
237 lines
7.9 KiB
JavaScript
237 lines
7.9 KiB
JavaScript
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
import { readFileSync } from 'fs';
|
|
import path from 'path';
|
|
|
|
const {
|
|
PAGE_CONTROLS_MODULE,
|
|
STATE_MODULE,
|
|
STORAGE_MODULE,
|
|
UI_HELPERS_MODULE,
|
|
EVENT_MANAGER_MODULE,
|
|
UPDATE_CHECK_MODULE,
|
|
SIDEBAR_MODULE,
|
|
SORT_DROPDOWN_MODULE,
|
|
API_FACTORY_MODULE,
|
|
I18N_MODULE,
|
|
} = vi.hoisted(() => ({
|
|
PAGE_CONTROLS_MODULE: new URL('../../../../static/js/components/controls/PageControls.js', import.meta.url).pathname,
|
|
STATE_MODULE: new URL('../../../../static/js/state/index.js', import.meta.url).pathname,
|
|
STORAGE_MODULE: new URL('../../../../static/js/utils/storageHelpers.js', import.meta.url).pathname,
|
|
UI_HELPERS_MODULE: new URL('../../../../static/js/utils/uiHelpers.js', import.meta.url).pathname,
|
|
EVENT_MANAGER_MODULE: new URL('../../../../static/js/utils/EventManager.js', import.meta.url).pathname,
|
|
UPDATE_CHECK_MODULE: new URL('../../../../static/js/utils/updateCheckHelpers.js', import.meta.url).pathname,
|
|
SIDEBAR_MODULE: new URL('../../../../static/js/components/SidebarManager.js', import.meta.url).pathname,
|
|
SORT_DROPDOWN_MODULE: new URL('../../../../static/js/components/controls/SortDropdown.js', import.meta.url).pathname,
|
|
API_FACTORY_MODULE: new URL('../../../../static/js/api/modelApiFactory.js', import.meta.url).pathname,
|
|
I18N_MODULE: new URL('../../../../static/js/utils/i18nHelpers.js', import.meta.url).pathname,
|
|
}));
|
|
|
|
const CONTROLS_TEMPLATE = path.resolve(
|
|
__dirname,
|
|
'../../../../templates/components/controls.html'
|
|
);
|
|
|
|
const showToastMock = vi.fn();
|
|
const modelClient = {
|
|
fetchModelRoots: vi.fn(),
|
|
refreshModels: vi.fn(),
|
|
};
|
|
|
|
vi.mock(STATE_MODULE, () => ({
|
|
state: {},
|
|
getCurrentPageState: vi.fn(() => ({ filters: {} })),
|
|
setCurrentPageType: vi.fn(),
|
|
}));
|
|
|
|
vi.mock(STORAGE_MODULE, () => ({
|
|
getStorageItem: vi.fn(),
|
|
setStorageItem: vi.fn(),
|
|
removeStorageItem: vi.fn(),
|
|
getSessionItem: vi.fn(),
|
|
setSessionItem: vi.fn(),
|
|
removeSessionItem: vi.fn(),
|
|
}));
|
|
|
|
vi.mock(UI_HELPERS_MODULE, () => ({
|
|
showToast: showToastMock,
|
|
openCivitaiByMetadata: vi.fn(),
|
|
isTypingContext: vi.fn(() => false),
|
|
}));
|
|
|
|
vi.mock(EVENT_MANAGER_MODULE, () => ({
|
|
eventManager: { on: vi.fn(), off: vi.fn(), emit: vi.fn() },
|
|
}));
|
|
|
|
vi.mock(UPDATE_CHECK_MODULE, () => ({
|
|
performModelUpdateCheck: vi.fn(),
|
|
}));
|
|
|
|
vi.mock(SIDEBAR_MODULE, () => ({
|
|
sidebarManager: {
|
|
setHostPageControls: vi.fn(),
|
|
initialize: vi.fn(async () => {}),
|
|
refresh: vi.fn(async () => {}),
|
|
},
|
|
}));
|
|
|
|
vi.mock(SORT_DROPDOWN_MODULE, () => ({
|
|
initSortDropdown: vi.fn(),
|
|
applySortToSelect: vi.fn(),
|
|
randomizeSortValue: vi.fn(),
|
|
}));
|
|
|
|
vi.mock(API_FACTORY_MODULE, () => ({
|
|
getModelApiClient: () => modelClient,
|
|
}));
|
|
|
|
vi.mock(I18N_MODULE, () => ({
|
|
translate: vi.fn((key, params, fallback) => {
|
|
if (!fallback) {
|
|
return key;
|
|
}
|
|
return Object.entries(params || {}).reduce(
|
|
(text, [name, value]) => text.replaceAll(`{${name}}`, value),
|
|
fallback
|
|
);
|
|
}),
|
|
}));
|
|
|
|
const { PageControls } = await import(PAGE_CONTROLS_MODULE);
|
|
|
|
const ROOT_DETAILS = [
|
|
{ path: '/mnt/a/loras', label: 'a/loras', reachable: true, models: 12 },
|
|
{ path: '/mnt/b/loras', label: 'b/loras', reachable: false, models: 3 },
|
|
];
|
|
|
|
function buildControlsDom() {
|
|
document.body.innerHTML = `
|
|
<div class="dropdown-group">
|
|
<button data-action="refresh" class="dropdown-main"></button>
|
|
<button class="dropdown-toggle"></button>
|
|
<div class="dropdown-menu">
|
|
<div class="dropdown-item" data-action="full-rebuild"></div>
|
|
<div class="dropdown-separator"></div>
|
|
<div class="dropdown-section-title">Scan one folder</div>
|
|
<div id="refreshScopeMenu" class="dropdown-scope-list"></div>
|
|
</div>
|
|
</div>`;
|
|
}
|
|
|
|
function bareControls(api = {}) {
|
|
const controls = Object.create(PageControls.prototype);
|
|
controls.pageType = 'loras';
|
|
controls.api = api;
|
|
controls._scanScopeDetails = null;
|
|
controls._scanScopeLoading = false;
|
|
controls.refreshModels = vi.fn();
|
|
controls.sidebarManager = {
|
|
setHostPageControls: vi.fn(),
|
|
initialize: vi.fn(async () => {}),
|
|
};
|
|
return controls;
|
|
}
|
|
|
|
describe('PageControls refresh scope menu', () => {
|
|
beforeEach(() => {
|
|
showToastMock.mockReset();
|
|
modelClient.fetchModelRoots.mockReset();
|
|
modelClient.refreshModels.mockReset();
|
|
modelClient.fetchModelRoots.mockResolvedValue({ root_details: ROOT_DETAILS });
|
|
});
|
|
|
|
afterEach(() => {
|
|
document.body.innerHTML = '';
|
|
});
|
|
|
|
it('keeps the scope container in the controls template (non-recipes pages)', () => {
|
|
const html = readFileSync(CONTROLS_TEMPLATE, 'utf-8');
|
|
const rebuildIndex = html.indexOf('data-action="full-rebuild"');
|
|
const scopeIndex = html.indexOf('id="refreshScopeMenu"');
|
|
|
|
expect(rebuildIndex).toBeGreaterThan(-1);
|
|
// Same dropdown, after the rebuild entry.
|
|
expect(scopeIndex).toBeGreaterThan(rebuildIndex);
|
|
expect(html).toContain('loras.controls.refresh.scopeSection');
|
|
// The recipes page has no model roots, so the section is gated.
|
|
expect(html.slice(rebuildIndex, scopeIndex)).toContain("{% if page_id != 'recipes' %}");
|
|
});
|
|
|
|
it('registers the scan-scope API for every page through registerAPI', async () => {
|
|
const controls = bareControls();
|
|
controls.registerAPI({});
|
|
|
|
expect(typeof controls.api.fetchModelRoots).toBe('function');
|
|
expect(typeof controls.api.refreshModels).toBe('function');
|
|
|
|
await controls.api.fetchModelRoots();
|
|
expect(modelClient.fetchModelRoots).toHaveBeenCalled();
|
|
|
|
// The page facades used to drop the second argument, which silently turned
|
|
// a scoped scan into a full refresh.
|
|
await controls.api.refreshModels(false, { roots: ['/mnt/a/loras'] });
|
|
expect(modelClient.refreshModels).toHaveBeenCalledWith(false, { roots: ['/mnt/a/loras'] });
|
|
});
|
|
|
|
it('renders the root rows when the dropdown is opened', async () => {
|
|
buildControlsDom();
|
|
const controls = bareControls({
|
|
fetchModelRoots: vi.fn(async () => ({ root_details: ROOT_DETAILS })),
|
|
refreshModels: vi.fn(),
|
|
});
|
|
|
|
controls.initDropdowns();
|
|
document.querySelector('.dropdown-toggle').click();
|
|
|
|
await vi.waitFor(() => {
|
|
expect(document.querySelectorAll('.scan-root-item').length).toBe(2);
|
|
});
|
|
expect(document.querySelector('.scan-root-item').dataset.root).toBe('/mnt/a/loras');
|
|
expect(document.querySelector('.scan-root-count').textContent).toBe('12 models');
|
|
expect(document.querySelectorAll('.scan-root-item')[1].classList.contains('is-offline')).toBe(true);
|
|
});
|
|
|
|
it('scans the clicked root only', async () => {
|
|
buildControlsDom();
|
|
const controls = bareControls({
|
|
fetchModelRoots: vi.fn(async () => ({ root_details: ROOT_DETAILS })),
|
|
refreshModels: vi.fn(),
|
|
});
|
|
|
|
controls.initDropdowns();
|
|
document.querySelector('.dropdown-toggle').click();
|
|
await vi.waitFor(() => {
|
|
expect(document.querySelectorAll('.scan-root-item').length).toBe(2);
|
|
});
|
|
|
|
document.querySelectorAll('.scan-root-item')[0].click();
|
|
|
|
expect(controls.refreshModels).toHaveBeenCalledWith(false, { roots: ['/mnt/a/loras'] });
|
|
expect(showToastMock).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('explains an offline root instead of scanning it', async () => {
|
|
buildControlsDom();
|
|
const controls = bareControls({
|
|
fetchModelRoots: vi.fn(async () => ({ root_details: ROOT_DETAILS })),
|
|
refreshModels: vi.fn(),
|
|
});
|
|
|
|
controls.initDropdowns();
|
|
document.querySelector('.dropdown-toggle').click();
|
|
await vi.waitFor(() => {
|
|
expect(document.querySelectorAll('.scan-root-item').length).toBe(2);
|
|
});
|
|
|
|
document.querySelectorAll('.scan-root-item')[1].click();
|
|
|
|
expect(controls.refreshModels).not.toHaveBeenCalled();
|
|
// Exactly three arguments: key, params, type. A 4th "fallback" argument
|
|
// pushed the sentence into the type slot and rendered an unstyled toast.
|
|
expect(showToastMock).toHaveBeenCalledWith(
|
|
'toast.api.scanRootUnreachable',
|
|
{ scope: 'b/loras' },
|
|
'info'
|
|
);
|
|
});
|
|
});
|