wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-12-17 10:02:59 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix: escape "_" symbol in all other places

Browse Source
This commit is contained in:
bigcat88 2025-09-15 20:26:48 +03:00
parent f1fb7432a0
commit 0be513b213
No known key found for this signature in database
GPG Key ID: 1F0BF0EC3CF22721
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets_scanner.py
View File

@ -22,6 +22,7 @@ from .api import schemas_in, schemas_out
from .database.db import create_session from .database.db import create_session
from .database.helpers import ( from .database.helpers import (
add_missing_tag_for_asset_id, add_missing_tag_for_asset_id,
escape_like_prefix,
remove_missing_tag_for_asset_id, remove_missing_tag_for_asset_id,
) )
from .database.models import Asset, AssetCacheState, AssetInfo from .database.models import Asset, AssetCacheState, AssetInfo
@ -160,7 +161,7 @@ def _scan_progress_to_scan_status_model(progress: ScanProgress) -> schemas_out.A
) )
async def _refresh_verify_flags_for_root(root: schemas_in.RootType, prog: ScanProgress) -> None: async def _refresh_verify_flags_for_root(root: schemas_in.RootType) -> None:
"""Fast pass to mark verify candidates by comparing stored mtime_ns with on-disk mtime.""" """Fast pass to mark verify candidates by comparing stored mtime_ns with on-disk mtime."""
prefixes = prefixes_for_root(root) prefixes = prefixes_for_root(root)
if not prefixes: if not prefixes:
@ -171,7 +172,8 @@ async def _refresh_verify_flags_for_root(root: schemas_in.RootType, prog: ScanPr
base = os.path.abspath(p) base = os.path.abspath(p)
if not base.endswith(os.sep): if not base.endswith(os.sep):
base += os.sep base += os.sep
conds.append(AssetCacheState.file_path.like(base + "%")) escaped, esc = escape_like_prefix(base)
conds.append(AssetCacheState.file_path.like(escaped + "%", escape=esc))
async with await create_session() as sess: async with await create_session() as sess:
rows = ( rows = (
@ -227,7 +229,7 @@ async def _run_hash_verify_pipeline(root: schemas_in.RootType, prog: ScanProgres
try: try:
prefixes = prefixes_for_root(root) prefixes = prefixes_for_root(root)
await _refresh_verify_flags_for_root(root, prog) await _refresh_verify_flags_for_root(root)
# collect candidates from DB # collect candidates from DB
async with await create_session() as sess: async with await create_session() as sess:
@ -419,7 +421,8 @@ async def _fast_db_consistency_pass(root: schemas_in.RootType) -> None:
base = os.path.abspath(p) base = os.path.abspath(p)
if not base.endswith(os.sep): if not base.endswith(os.sep):
base += os.sep base += os.sep
conds.append(AssetCacheState.file_path.like(base + "%")) escaped, esc = escape_like_prefix(base)
conds.append(AssetCacheState.file_path.like(escaped + "%", escape=esc))
async with await create_session() as sess: async with await create_session() as sess:
if not conds: if not conds:
@ -443,7 +446,6 @@ async def _fast_db_consistency_pass(root: schemas_in.RootType) -> None:
acc = {"hash": a_hash, "size_db": int(a_size or 0), "states": []} acc = {"hash": a_hash, "size_db": int(a_size or 0), "states": []}
by_asset[aid] = acc by_asset[aid] = acc
exists = False
fast_ok = False fast_ok = False
try: try:
s = os.stat(st.file_path, follow_symlinks=True) s = os.stat(st.file_path, follow_symlinks=True)

10
app/database/services/content.py
View File

@ -16,6 +16,7 @@ from ..._assets_helpers import compute_relative_filename, normalize_tags
from ...storage import hashing as hashing_mod from ...storage import hashing as hashing_mod
from ..helpers import ( from ..helpers import (
ensure_tags_exist, ensure_tags_exist,
escape_like_prefix,
remove_missing_tag_for_asset_id, remove_missing_tag_for_asset_id,
) )
from ..models import Asset, AssetCacheState, AssetInfo, AssetInfoTag, Tag from ..models import Asset, AssetCacheState, AssetInfo, AssetInfoTag, Tag
@ -417,7 +418,8 @@ async def list_unhashed_candidates_under_prefixes(session: AsyncSession, *, pref
base = os.path.abspath(p) base = os.path.abspath(p)
if not base.endswith(os.sep): if not base.endswith(os.sep):
base += os.sep base += os.sep
conds.append(AssetCacheState.file_path.like(base + "%")) escaped, esc = escape_like_prefix(base)
conds.append(AssetCacheState.file_path.like(escaped + "%", escape=esc))
path_filter = sa.or_(*conds) if len(conds) > 1 else conds[0] path_filter = sa.or_(*conds) if len(conds) > 1 else conds[0]
if session.bind.dialect.name == "postgresql": if session.bind.dialect.name == "postgresql":
@ -450,7 +452,8 @@ async def list_verify_candidates_under_prefixes(
base = os.path.abspath(p) base = os.path.abspath(p)
if not base.endswith(os.sep): if not base.endswith(os.sep):
base += os.sep base += os.sep
conds.append(AssetCacheState.file_path.like(base + "%")) escaped, esc = escape_like_prefix(base)
conds.append(AssetCacheState.file_path.like(escaped + "%", escape=esc))
return ( return (
await session.execute( await session.execute(
@ -756,7 +759,8 @@ async def list_cache_states_with_asset_under_prefixes(
base = os.path.abspath(p) base = os.path.abspath(p)
if not base.endswith(os.sep): if not base.endswith(os.sep):
base = base + os.sep base = base + os.sep
conds.append(AssetCacheState.file_path.like(base + "%")) escaped, esc = escape_like_prefix(base)
conds.append(AssetCacheState.file_path.like(escaped + "%", escape=esc))
if not conds: if not conds:
return [] return []