alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-25 15:15:44 -03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: streamline model scanning by removing redundant file processing method and enhancing directory scanning logic

Browse Source
This commit is contained in:
Will Miao
2025-08-04 15:49:50 +08:00
parent bf7b07ba74
commit e8a30088ef
1 changed files with 3 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
py/services/model_scanner.py
View File

@@ -569,12 +569,12 @@ class ModelScanner:
for entry in entries: for entry in entries:
try: try:
if entry.is_file(follow_symlinks=True) and any(entry.name.endswith(ext) for ext in self.file_extensions): if entry.is_file(follow_symlinks=True) and any(entry.name.endswith(ext) for ext in self.file_extensions):
# Use original path instead of real path
file_path = entry.path.replace(os.sep, "/") file_path = entry.path.replace(os.sep, "/")
await self._process_single_file(file_path, original_root, models) result = await self._process_model_file(file_path, original_root)
if result:
models.append(result)
await asyncio.sleep(0) await asyncio.sleep(0)
elif entry.is_dir(follow_symlinks=True): elif entry.is_dir(follow_symlinks=True):
# For directories, continue scanning with original path
await scan_recursive(entry.path, visited_paths) await scan_recursive(entry.path, visited_paths)
except Exception as e: except Exception as e:
logger.error(f"Error processing entry {entry.path}: {e}") logger.error(f"Error processing entry {entry.path}: {e}")
@@ -584,15 +584,6 @@ class ModelScanner:
await scan_recursive(root_path, set()) await scan_recursive(root_path, set())
return models return models
async def _process_single_file(self, file_path: str, root_path: str, models: list):
"""Process a single file and add to results list"""
try:
result = await self._process_model_file(file_path, root_path)
if result:
models.append(result)
except Exception as e:
logger.error(f"Error processing {file_path}: {e}")
def is_initializing(self) -> bool: def is_initializing(self) -> bool:
"""Check if the scanner is currently initializing""" """Check if the scanner is currently initializing"""
return self._is_initializing return self._is_initializing
@@ -732,48 +723,6 @@ class ModelScanner:
except Exception as e: except Exception as e:
logger.error(f"Failed to update metadata from Civitai for {file_path}: {e}") logger.error(f"Failed to update metadata from Civitai for {file_path}: {e}")
async def _scan_directory(self, root_path: str) -> List[Dict]:
"""Base implementation for directory scanning"""
models = []
original_root = root_path
async def scan_recursive(path: str, visited_paths: set):
try:
real_path = os.path.realpath(path)
if real_path in visited_paths:
logger.debug(f"Skipping already visited path: {path}")
return
visited_paths.add(real_path)
with os.scandir(path) as it:
entries = list(it)
for entry in entries:
try:
if entry.is_file(follow_symlinks=True):
ext = os.path.splitext(entry.name)[1].lower()
if ext in self.file_extensions:
file_path = entry.path.replace(os.sep, "/")
await self._process_single_file(file_path, original_root, models)
await asyncio.sleep(0)
elif entry.is_dir(follow_symlinks=True):
await scan_recursive(entry.path, visited_paths)
except Exception as e:
logger.error(f"Error processing entry {entry.path}: {e}")
except Exception as e:
logger.error(f"Error scanning {path}: {e}")
await scan_recursive(root_path, set())
return models
async def _process_single_file(self, file_path: str, root_path: str, models_list: list):
"""Process a single file and add to results list"""
try:
result = await self._process_model_file(file_path, root_path)
if result:
models_list.append(result)
except Exception as e:
logger.error(f"Error processing {file_path}: {e}")
async def add_model_to_cache(self, metadata_dict: Dict, folder: str = '') -> bool: async def add_model_to_cache(self, metadata_dict: Dict, folder: str = '') -> bool:
"""Add a model to the cache """Add a model to the cache