From 55e69ac9b8db3971eebbfbdd6922e52809527975 Mon Sep 17 00:00:00 2001 From: lgldlk <1851293758@qq.com> Date: Wed, 25 Jun 2025 17:19:07 +0800 Subject: [PATCH] feat: Simplify custom nodes whitelist logic to use consistent code paths --- main.py | 5 +---- nodes.py | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/main.py b/main.py index 957d9dee7..1941b742a 100644 --- a/main.py +++ b/main.py @@ -66,9 +66,6 @@ def execute_prestartup_script(): logging.error(f"Failed to execute startup-script: {script_path} / {e}") return False - if args.disable_all_custom_nodes and not args.whitelist_custom_nodes: - return - node_paths = folder_paths.get_folder_paths("custom_nodes") for custom_node_path in node_paths: possible_modules = os.listdir(custom_node_path) @@ -274,7 +271,7 @@ def start_comfyui(asyncio_loop=None): hook_breaker_ac10a0.save_functions() nodes.init_extra_nodes( - init_custom_nodes=(not args.disable_all_custom_nodes) or bool(args.whitelist_custom_nodes), + init_custom_nodes=True, init_api_nodes=not args.disable_api_nodes ) hook_breaker_ac10a0.restore_functions() diff --git a/nodes.py b/nodes.py index 23fa2b6aa..02a75ddd3 100644 --- a/nodes.py +++ b/nodes.py @@ -2187,11 +2187,9 @@ def init_external_custom_nodes(): module_path = os.path.join(custom_node_path, possible_module) if os.path.isfile(module_path) and os.path.splitext(module_path)[1] != ".py": continue if module_path.endswith(".disabled"): continue - if args.disable_all_custom_nodes and possible_module not in args.whitelist_custom_nodes: logging.info(f"Skipping {possible_module} due to disable_all_custom_nodes and whitelist_custom_nodes") continue - time_before = time.perf_counter() success = load_custom_node(module_path, base_node_names, module_parent="custom_nodes") node_import_times.append((time.perf_counter() - time_before, module_path, success))