From 629a2bf4236d410adabb8e38b15482cfc4c22202 Mon Sep 17 00:00:00 2001 From: stephennilor Date: Wed, 1 Oct 2025 18:41:29 +0800 Subject: [PATCH] revert accidental change to LoadVideosFromFolder node --- nodes/image_nodes.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nodes/image_nodes.py b/nodes/image_nodes.py index bb8f91d..e48be02 100644 --- a/nodes/image_nodes.py +++ b/nodes/image_nodes.py @@ -3807,29 +3807,29 @@ class LoadVideosFromFolder: try: cls.vhs_nodes = importlib.import_module("comfyui-videohelpersuite.videohelpersuite") except ImportError: - # Fallback to sys.modules sweep for Windows/packaging variations + # Fallback to sys.modules search for Windows compatibility import sys vhs_module = None for module_name in sys.modules: - try: - mod = sys.modules[module_name] - if mod and hasattr(mod, "videohelpersuite"): - vhs_module = mod - break - except Exception: - continue - + if 'videohelpersuite' in module_name and 'videohelpersuite' in sys.modules[module_name].__dict__: + vhs_module = sys.modules[module_name] + break + if vhs_module is None: + # Try direct access to the videohelpersuite submodule for module_name in sys.modules: if module_name.endswith('videohelpersuite'): - vhs_module = sys.modules.get(module_name) - if vhs_module is not None: - break - + vhs_module = sys.modules[module_name] + break + if vhs_module is not None: cls.vhs_nodes = vhs_module else: raise ImportError("This node requires ComfyUI-VideoHelperSuite to be installed.") + + except ImportError: + raise ImportError("This node requires ComfyUI-VideoHelperSuite to be installed.") + @classmethod def INPUT_TYPES(s): return {