mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-10-07 18:12:12 -03:00
feat(sidebar): scan a single folder from the folder context menu (#1108)
The Refresh menu can scope a scan to one model root, but the folder a user is
looking at lives in the sidebar's unified tree, which merges every root into one
relative-path namespace. "Scan this folder" therefore addresses the folder, not a
root: the backend walks that relative path under every root that holds it, which
is also what makes the action safe while another drive is switched off.
Backend:
* GET /scan accepts `folder=<rel>` (alone or with `roots=`), rejected together
with full_rebuild=true like the roots parameter. Validation reuses
normalize_relative_folder(), extracted to module scope from ModelMoveService so
the folder operations and the scan endpoint reject the same input (absolute
paths, drive letters, `..` climbing) instead of each carrying its own copy.
* The reconcile summary carries `scope_label` (the folder) for a folder scope, so
the result toast names the folder the user clicked instead of the roots it
happens to live under; the completed WS payload carries it too.
* `folder` is a scope prefix exactly like a root: only that subtree is re-read or
pruned, and an unreachable root keeps the entries that fall inside it.
Frontend:
* The sidebar folder context menu gains "Scan this folder" above "Check for
updates in this folder" (they share the refresh divider); the entry is gated by
the same supportsFolderManagement flag as the other folder operations.
* SidebarManager.scanFolder() resolves the node through the existing
_resolveFolderCandidates() before doing anything: a folder no root holds any
more explains itself ("no longer exists on disk") instead of scanning nothing,
and an unresolvable multi-root node is refused rather than guessed.
* PageControls.refreshModels() and BaseModelApi.refreshModels() forward the folder
scope, and _showRefreshSummary() prefers scope_label over the walked roots.
Verified live on the three-root sandbox with one drive switched off:
GET /scan?folder=pack000 walks drive-G and drive-Y, reports scope_label=pack000,
keeps drive-Z's 6 entries under that folder (kept_unreachable=6) and leaves all
420 models cached. 3704 passed, 7 skipped; frontend 1495 passed (150 files); vue
widgets 96 passed. The 2 new sidebar keys are [TODO: Translate] placeholders
pending the feature owner's go-ahead.
This commit is contained in:
@@ -2609,6 +2609,46 @@ async def test_reconcile_folder_scope_keeps_folder_tree_outside_scope(tmp_path:
|
||||
assert {item["file_path"] for item in scanner._cache.raw_data} == set()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_reconcile_folder_scope_covers_every_root_holding_it(tmp_path: Path):
|
||||
"""The sidebar's unified tree has no root identity: a folder scope means
|
||||
"this relative folder under every root that holds it"."""
|
||||
primary = tmp_path / "primary"
|
||||
usb = tmp_path / "usb"
|
||||
for root in (primary, usb):
|
||||
(root / "pack").mkdir(parents=True)
|
||||
(root / "other").mkdir()
|
||||
(root / "other" / "keep.txt").write_text("k", encoding="utf-8")
|
||||
(primary / "pack" / "a.txt").write_text("a", encoding="utf-8")
|
||||
(usb / "pack" / "b.txt").write_text("b", encoding="utf-8")
|
||||
# Only the primary root holds this folder; the usb copy is gone.
|
||||
(primary / "only-primary").mkdir()
|
||||
(primary / "only-primary" / "c.txt").write_text("c", encoding="utf-8")
|
||||
(usb / "only-primary").mkdir()
|
||||
|
||||
scanner = MultiRootDummyScanner([primary, usb])
|
||||
await scanner._initialize_cache()
|
||||
|
||||
(usb / "pack" / "b.txt").unlink()
|
||||
(primary / "only-primary" / "c.txt").unlink()
|
||||
(primary / "pack" / "new.txt").write_text("n", encoding="utf-8")
|
||||
|
||||
summary = await scanner._reconcile_cache(scope=ReconcileScope(folder="pack"))
|
||||
|
||||
assert summary is not None
|
||||
assert summary["scope_label"] == "pack"
|
||||
assert summary["added"] == 1
|
||||
assert summary["removed"] == 1
|
||||
paths = {item["file_path"] for item in scanner._cache.raw_data}
|
||||
# Both copies of the scoped folder were walked...
|
||||
assert _normalize_path(primary / "pack" / "new.txt") in paths
|
||||
assert _normalize_path(usb / "pack" / "b.txt") not in paths
|
||||
# ...and nothing outside it was touched, including the folder that only one
|
||||
# root holds.
|
||||
assert _normalize_path(usb / "other" / "keep.txt") in paths
|
||||
assert _normalize_path(primary / "only-primary" / "c.txt") in paths
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_reconcile_keeps_entries_under_unreadable_dir(tmp_path: Path, monkeypatch):
|
||||
"""A directory os.walk cannot enter (permissions, I/O error, offline
|
||||
|
||||
Reference in New Issue
Block a user