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

refactor: Normalize and deduplicate checkpoint and unet paths in configuration

Browse Source
This commit is contained in:
Will Miao
2025-07-19 23:06:43 +08:00
parent 9edfc68e91
commit 357c4e9c08
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
py/config.py
View File

@@ -171,23 +171,33 @@ class Config:
"""Initialize and validate checkpoint paths from ComfyUI settings""" """Initialize and validate checkpoint paths from ComfyUI settings"""
try: try:
# Get checkpoint paths from folder_paths # Get checkpoint paths from folder_paths
checkpoint_paths = folder_paths.get_folder_paths("checkpoints") raw_checkpoint_paths = folder_paths.get_folder_paths("checkpoints")
unet_paths = folder_paths.get_folder_paths("unet") raw_unet_paths = folder_paths.get_folder_paths("unet")
# Sort each list individually # Normalize and resolve symlinks for checkpoints, store mapping from resolved -> original
checkpoint_paths = sorted(set(path.replace(os.sep, "/") checkpoint_map = {}
for path in checkpoint_paths for path in raw_checkpoint_paths:
if os.path.exists(path)), key=lambda p: p.lower()) if os.path.exists(path):
real_path = os.path.normpath(os.path.realpath(path)).replace(os.sep, '/')
checkpoint_map[real_path] = checkpoint_map.get(real_path, path.replace(os.sep, "/")) # preserve first seen
unet_paths = sorted(set(path.replace(os.sep, "/") # Normalize and resolve symlinks for unet, store mapping from resolved -> original
for path in unet_paths unet_map = {}
if os.path.exists(path)), key=lambda p: p.lower()) for path in raw_unet_paths:
if os.path.exists(path):
real_path = os.path.normpath(os.path.realpath(path)).replace(os.sep, '/')
unet_map[real_path] = unet_map.get(real_path, path.replace(os.sep, "/")) # preserve first seen
# Combine all checkpoint-related paths, ensuring checkpoint_paths are first # Now sort and use only the deduplicated real paths
all_paths = checkpoint_paths + unet_paths unique_checkpoint_paths = sorted(checkpoint_map.values(), key=lambda p: p.lower())
unique_unet_paths = sorted(unet_map.values(), key=lambda p: p.lower())
self.checkpoints_roots = checkpoint_paths
self.unet_roots = unet_paths # Store individual paths in class properties
self.checkpoints_roots = unique_checkpoint_paths
self.unet_roots = unique_unet_paths
# Combine all checkpoint-related paths for return value
all_paths = unique_checkpoint_paths + unique_unet_paths
logger.info("Found checkpoint roots:" + ("\n - " + "\n - ".join(all_paths) if all_paths else "[]")) logger.info("Found checkpoint roots:" + ("\n - " + "\n - ".join(all_paths) if all_paths else "[]"))
@@ -195,11 +205,11 @@ class Config:
logger.warning("No valid checkpoint folders found in ComfyUI configuration") logger.warning("No valid checkpoint folders found in ComfyUI configuration")
return [] return []
# Initialize path mappings, similar to LoRA path handling # Initialize path mappings
for path in all_paths: for original_path in all_paths:
real_path = os.path.normpath(os.path.realpath(path)).replace(os.sep, '/') real_path = os.path.normpath(os.path.realpath(original_path)).replace(os.sep, '/')
if real_path != path: if real_path != original_path:
self.add_path_mapping(path, real_path) self.add_path_mapping(original_path, real_path)
return all_paths return all_paths
except Exception as e: except Exception as e: