From 34c7bfea12336fd3aa9248c8fd33822bf584fc6b Mon Sep 17 00:00:00 2001 From: huchenlei Date: Mon, 1 Jul 2024 17:44:37 -0400 Subject: [PATCH] nit --- comfy/cli_args.py | 2 +- main.py | 8 ++++---- nodes.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/comfy/cli_args.py b/comfy/cli_args.py index 9336bddff..b72bf3998 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -118,7 +118,7 @@ parser.add_argument("--quick-test-for-ci", action="store_true", help="Quick test parser.add_argument("--windows-standalone-build", action="store_true", help="Windows standalone build: Enable convenient things that most people using the standalone windows build will probably enjoy (like auto opening the page on startup).") parser.add_argument("--disable-metadata", action="store_true", help="Disable saving prompt metadata in files.") -parser.add_argument("--no-custom-node", action="store_true", help="Disable loading custom nodes.") +parser.add_argument("--disable-all-custom-nodes", action="store_true", help="Disable loading all custom nodes.") parser.add_argument("--multi-user", action="store_true", help="Enables per-user storage.") diff --git a/main.py b/main.py index d9f02bad8..2957dd2ff 100644 --- a/main.py +++ b/main.py @@ -20,7 +20,7 @@ def execute_prestartup_script(): print(f"Failed to execute startup-script: {script_path} / {e}") return False - if args.no_custom_node: + if args.disable_all_custom_nodes: return node_paths = folder_paths.get_folder_paths("custom_nodes") @@ -81,7 +81,7 @@ import yaml import execution import server from server import BinaryEventTypes -from nodes import init_builtin_custom_nodes, init_external_custom_nodes +from nodes import init_builtin_extra_nodes, init_external_custom_nodes import comfy.model_management def cuda_malloc_warning(): @@ -219,8 +219,8 @@ if __name__ == "__main__": for config_path in itertools.chain(*args.extra_model_paths_config): load_extra_path_config(config_path) - init_builtin_custom_nodes() - if not args.no_custom_node: + init_builtin_extra_nodes() + if not args.disable_all_custom_nodes: init_external_custom_nodes() else: logging.info("Skipping loading of custom nodes") diff --git a/nodes.py b/nodes.py index 1df9c423f..a0d2178f4 100644 --- a/nodes.py +++ b/nodes.py @@ -1961,12 +1961,12 @@ def init_external_custom_nodes(): logging.info("{:6.1f} seconds{}: {}".format(n[0], import_message, n[1])) logging.info("") -def init_builtin_custom_nodes(): +def init_builtin_extra_nodes(): """ - Initializes the built-in custom nodes in ComfyUI. + Initializes the built-in extra nodes in ComfyUI. - This function loads the custom node files located in the "comfy_extras" directory and imports them into ComfyUI. - If any of the custom node files fail to import, a warning message is logged. + This function loads the extra node files located in the "comfy_extras" directory and imports them into ComfyUI. + If any of the extra node files fail to import, a warning message is logged. Returns: None