From 32631c61b666b0049dd4f22dab1c150bc60c6f2f Mon Sep 17 00:00:00 2001 From: Jose Gutierrez Date: Sat, 2 Sep 2023 13:33:35 +0200 Subject: [PATCH] Make input directory configurable - Added --input-directory as a command line argument to configure --- .gitignore | 1 + comfy/cli_args.py | 1 + folder_paths.py | 10 ++++++++-- main.py | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0177e1d7d..5599430cb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ venv/ web/extensions/* !web/extensions/logging.js.example !web/extensions/core/ +*.log diff --git a/comfy/cli_args.py b/comfy/cli_args.py index fda245433..daadb5806 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -38,6 +38,7 @@ parser.add_argument("--port", type=int, default=8188, help="Set the listen port. parser.add_argument("--enable-cors-header", type=str, default=None, metavar="ORIGIN", nargs="?", const="*", help="Enable CORS (Cross-Origin Resource Sharing) with optional origin or allow all with default '*'.") parser.add_argument("--extra-model-paths-config", type=str, default=None, metavar="PATH", nargs='+', action='append', help="Load one or more extra_model_paths.yaml files.") parser.add_argument("--output-directory", type=str, default=None, help="Set the ComfyUI output directory.") +parser.add_argument("--input-directory", type=str, default=None, help="Set the ComfyUI input directory.") parser.add_argument("--temp-directory", type=str, default=None, help="Set the ComfyUI temp directory (default is in the ComfyUI directory).") parser.add_argument("--auto-launch", action="store_true", help="Automatically launch ComfyUI in the default browser.") parser.add_argument("--disable-auto-launch", action="store_true", help="Disable auto launching the browser.") diff --git a/folder_paths.py b/folder_paths.py index e321690dd..ec32e8ef3 100644 --- a/folder_paths.py +++ b/folder_paths.py @@ -36,8 +36,14 @@ input_directory = os.path.join(os.path.dirname(os.path.realpath(__file__)), "inp filename_list_cache = {} -if not os.path.exists(input_directory): - os.makedirs(input_directory) +def veryfy_input_directory(): + global input_directory + if not os.path.exists(input_directory): + os.makedirs(input_directory) + +def set_input_directory(input_dir): + global input_directory + input_directory = input_dir def set_output_directory(output_dir): global output_directory diff --git a/main.py b/main.py index a4038db4b..ebf35392e 100644 --- a/main.py +++ b/main.py @@ -171,6 +171,13 @@ if __name__ == "__main__": print(f"Setting output directory to: {output_dir}") folder_paths.set_output_directory(output_dir) + if args.input_directory: + input_dir = os.path.abspath(args.input_directory) + print(f"Setting input directory to: {input_dir}") + folder_paths.set_input_directory(input_dir) + + folder_paths.veryfy_input_directory() + if args.quick_test_for_ci: exit(0)