wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-23 10:03:36 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge 743599bd18 into 4c4be1bba5

Browse Source
This commit is contained in:
molbal 2026-03-14 13:33:09 -04:00 committed by GitHub
commit 9370d480dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nodes.py
View File

@ -1699,20 +1699,46 @@ class PreviewImage(SaveImage):
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"}, "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
} }
class LoadImage: class LoadImage:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
input_dir = folder_paths.get_input_directory() input_dir = folder_paths.get_input_directory()
files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))] files = []
files = folder_paths.filter_files_content_types(files, ["image"]) limit = 1000
recursive_scan_failed = False
# Attempt recursive scan first
try:
for root, _, file_list in os.walk(input_dir, followlinks=False):
if recursive_scan_failed:
break
image_files = folder_paths.filter_files_content_types(file_list, ["image"])
for image_file in image_files:
if len(files) >= limit:
recursive_scan_failed = True
break
path_relative = os.path.relpath(os.path.join(root, image_file), input_dir)
path_relative = path_relative.replace('\\', '/')
files.append(path_relative)
except Exception:
recursive_scan_failed = True
# Fallback to original non-recursive method if limit exceeded or error
if recursive_scan_failed or not files:
files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
files = folder_paths.filter_files_content_types(files, ["image"])
return {"required": return {"required":
{"image": (sorted(files), {"image_upload": True})}, {"image": (sorted(list(dict.fromkeys(files))), {"image_upload": True})},
} }
CATEGORY = "image" CATEGORY = "image"
ESSENTIALS_CATEGORY = "Basics" ESSENTIALS_CATEGORY = "Basics"
SEARCH_ALIASES = ["load image", "open image", "import image", "image input", "upload image", "read image", "image loader"] SEARCH_ALIASES = ["load image", "open image", "import image", "image input", "upload image", "read image", "image loader"]
RETURN_TYPES = ("IMAGE", "MASK") RETURN_TYPES = ("IMAGE", "MASK")
FUNCTION = "load_image" FUNCTION = "load_image"
def load_image(self, image): def load_image(self, image):