mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-06-19 17:02:04 -03:00
fix(example-images): skip hidden files in path validation, show offending items on failure (#807)
This commit is contained in:
@@ -9,6 +9,7 @@ import pytest
|
||||
from py.services.settings_manager import get_settings_manager
|
||||
from py.utils.example_images_paths import (
|
||||
ensure_library_root_exists,
|
||||
find_non_compliant_items_in_example_images_root,
|
||||
get_model_folder,
|
||||
get_model_relative_path,
|
||||
is_valid_example_images_root,
|
||||
@@ -140,3 +141,68 @@ def test_is_valid_example_images_root_accepts_legacy_library_structure(tmp_path,
|
||||
(hash_folder / 'image.png').write_text('data', encoding='utf-8')
|
||||
|
||||
assert is_valid_example_images_root(str(tmp_path)) is True
|
||||
|
||||
|
||||
def test_find_non_compliant_items_returns_empty_for_valid_root(tmp_path, settings_manager):
|
||||
"""An empty folder or one with only hash dirs should return []."""
|
||||
settings_manager.settings['example_images_path'] = str(tmp_path)
|
||||
|
||||
# Empty folder
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == []
|
||||
|
||||
# Only hash folders
|
||||
hash_folder = tmp_path / ('f' * 64)
|
||||
hash_folder.mkdir()
|
||||
(hash_folder / 'image.png').write_text('data', encoding='utf-8')
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == []
|
||||
|
||||
|
||||
def test_find_non_compliant_items_returns_offending_names(tmp_path, settings_manager):
|
||||
"""A folder with non-hash items should return their names."""
|
||||
settings_manager.settings['example_images_path'] = str(tmp_path)
|
||||
|
||||
# Create a valid hash folder so the root is otherwise acceptable
|
||||
hash_folder = tmp_path / ('a' * 64)
|
||||
hash_folder.mkdir()
|
||||
|
||||
# Add an offending file
|
||||
(tmp_path / 'readme.txt').write_text('hello', encoding='utf-8')
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == ['readme.txt']
|
||||
|
||||
# Add an offending directory with content (empty dirs are accepted as
|
||||
# potential legacy library folders by _library_folder_has_only_hash_dirs)
|
||||
offending_dir = tmp_path / 'not_a_hash'
|
||||
offending_dir.mkdir()
|
||||
(offending_dir / 'some_file.txt').write_text('data', encoding='utf-8')
|
||||
items = find_non_compliant_items_in_example_images_root(str(tmp_path))
|
||||
assert 'readme.txt' in items
|
||||
assert 'not_a_hash' in items
|
||||
|
||||
|
||||
def test_find_non_compliant_items_ignores_hidden_files(tmp_path, settings_manager):
|
||||
"""Hidden/system files should not appear in offending list."""
|
||||
settings_manager.settings['example_images_path'] = str(tmp_path)
|
||||
|
||||
# .DS_Store is an allowed file
|
||||
(tmp_path / '.DS_Store').write_text('', encoding='utf-8')
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == []
|
||||
|
||||
# Thumbs.db too
|
||||
(tmp_path / 'Thumbs.db').write_text('', encoding='utf-8')
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == []
|
||||
|
||||
|
||||
def test_find_non_compliant_items_accepts_download_progress_json(tmp_path, settings_manager):
|
||||
""".download_progress.json should be recognised as a valid metadata file."""
|
||||
settings_manager.settings['example_images_path'] = str(tmp_path)
|
||||
|
||||
(tmp_path / '.download_progress.json').write_text('{}', encoding='utf-8')
|
||||
assert find_non_compliant_items_in_example_images_root(str(tmp_path)) == []
|
||||
|
||||
|
||||
def test_find_non_compliant_items_reports_directory_error(tmp_path):
|
||||
"""When the directory cannot be listed, return an explanatory message."""
|
||||
non_existent = tmp_path / 'does-not-exist'
|
||||
result = find_non_compliant_items_in_example_images_root(str(non_existent))
|
||||
assert len(result) == 1
|
||||
assert 'cannot list directory' in result[0]
|
||||
|
||||
Reference in New Issue
Block a user