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

Enhance model file moving logic: support moving associated files and handle metadata paths

Browse Source
This commit is contained in:
Will Miao
2025-05-27 05:41:39 +08:00
parent f33a9abe60
commit 6e5f333364
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
py/services/model_scanner.py
View File

@@ -743,25 +743,40 @@ class ModelScanner:
shutil.move(real_source, real_target) shutil.move(real_source, real_target)
source_metadata = os.path.join(source_dir, f"{base_name}.metadata.json") # Move all associated files with the same base name
source_metadata = None
moved_metadata_path = None
# Find all files with the same base name in the source directory
files_to_move = []
try:
for file in os.listdir(source_dir):
if file.startswith(base_name + ".") and file != os.path.basename(source_path):
source_file_path = os.path.join(source_dir, file)
# Store metadata file path for special handling
if file == f"{base_name}.metadata.json":
source_metadata = source_file_path
moved_metadata_path = os.path.join(target_path, file)
else:
files_to_move.append((source_file_path, os.path.join(target_path, file)))
except Exception as e:
logger.error(f"Error listing files in {source_dir}: {e}")
# Move all associated files
metadata = None metadata = None
if os.path.exists(source_metadata): for source_file, target_file_path in files_to_move:
target_metadata = os.path.join(target_path, f"{base_name}.metadata.json") try:
shutil.move(source_metadata, target_metadata) shutil.move(source_file, target_file_path)
metadata = await self._update_metadata_paths(target_metadata, target_file) except Exception as e:
logger.error(f"Error moving associated file {source_file}: {e}")
# Move civitai.info file if exists # Handle metadata file specially to update paths
source_civitai = os.path.join(source_dir, f"{base_name}.civitai.info") if source_metadata and os.path.exists(source_metadata):
if os.path.exists(source_civitai): try:
target_civitai = os.path.join(target_path, f"{base_name}.civitai.info") shutil.move(source_metadata, moved_metadata_path)
shutil.move(source_civitai, target_civitai) metadata = await self._update_metadata_paths(moved_metadata_path, target_file)
except Exception as e:
for ext in PREVIEW_EXTENSIONS: logger.error(f"Error moving metadata file: {e}")
source_preview = os.path.join(source_dir, f"{base_name}{ext}")
if os.path.exists(source_preview):
target_preview = os.path.join(target_path, f"{base_name}{ext}")
shutil.move(source_preview, target_preview)
break
await self.update_single_model_cache(source_path, target_file, metadata) await self.update_single_model_cache(source_path, target_file, metadata)