From 2c2de008a9c033c97290779f9350daab05a56c52 Mon Sep 17 00:00:00 2001 From: "dr.lt.data" Date: Tue, 1 Aug 2023 13:15:36 +0900 Subject: [PATCH] improve: try execute disable.py if uninstall.py not exists update DB --- __init__.py | 12 +++++++++--- custom-node-list.json | 10 ++++++++++ extension-node-map.json | 16 ++++++++++++---- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/__init__.py b/__init__.py index 11c3848..713db66 100644 --- a/__init__.py +++ b/__init__.py @@ -33,7 +33,7 @@ sys.path.append('../..') from torchvision.datasets.utils import download_url # ensure .js -print("### Loading: ComfyUI-Manager (V0.17.1)") +print("### Loading: ComfyUI-Manager (V0.17.2)") comfy_ui_revision = "Unknown" @@ -679,19 +679,25 @@ def gitclone_uninstall(files): dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "") dir_path = os.path.join(custom_nodes_path, dir_name) - # safey check + # safety check if dir_path == '/' or dir_path[1:] == ":/" or dir_path == '': print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'") return False install_script_path = os.path.join(dir_path, "uninstall.py") + disable_script_path = os.path.join(dir_path, "disable.py") if os.path.exists(install_script_path): uninstall_cmd = [sys.executable, "uninstall.py"] code = subprocess.run(uninstall_cmd, cwd=dir_path) if code.returncode != 0: print(f"An error occurred during the execution of the uninstall.py script. Only the '{dir_path}' will be deleted.") - + elif os.path.exists(disable_script_path): + disable_script = [sys.executable, "disable.py"] + code = subprocess.run(disable_script, cwd=dir_path) + if code.returncode != 0: + print(f"An error occurred during the execution of the disable.py script. Only the '{dir_path}' will be deleted.") + if os.path.exists(dir_path): rmtree(dir_path) elif os.path.exists(dir_path + ".disabled"): diff --git a/custom-node-list.json b/custom-node-list.json index 0fecf03..c88488f 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -858,6 +858,16 @@ "install_type": "git-clone", "description": "Nodes: Prompt With Style, Prompt With SDXL, Resize Image for SDXL, Save Image With Prompt Data, HaldCLUT, Empty Latent Ratio Select/Custom SDXL" }, + { + "author": "failfa.st", + "title": "failfast-comfyui-extensions", + "reference": "https://github.com/failfa-st/failfast-comfyui-extensions", + "files": [ + "https://github.com/failfa-st/failfast-comfyui-extensions" + ], + "install_type": "git-clone", + "description": "node color customization, link rendering options, group freezing, node pinning, automated arrangement of nodes and more..." + }, { "author": "taabata", "title": "Syrian Falcon Nodes", diff --git a/extension-node-map.json b/extension-node-map.json index 9fb4a1f..c790b53 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -398,6 +398,7 @@ "https://github.com/RockOfFire/ComfyUI_Comfyroll_CustomNodes": [ "CR Apply ControlNet", "CR Aspect Ratio", + "CR Aspect Ratio SDXL", "CR Clip Input Switch", "CR Color Tint", "CR Conditioning Input Switch", @@ -417,6 +418,8 @@ "CR Module Output", "CR Module Pipe Loader", "CR Pipe Switch", + "CR Prompt Mixer", + "CR SDXL Prompt Mixer", "CR Seed to Int" ], "https://github.com/SLAPaper/ComfyUI-Image-Selector": [ @@ -444,6 +447,7 @@ "SeargePromptCombiner", "SeargePromptText", "SeargeSDXLBasePromptEncoder", + "SeargeSDXLImage2ImageSampler", "SeargeSDXLPromptEncoder", "SeargeSDXLRefinerPromptEncoder", "SeargeSDXLSampler" @@ -686,16 +690,19 @@ "DPMagicPrompt", "DPRandomGenerator" ], - "https://github.com/alpertunga-bile/prompt-generator-comfyui/raw/master/prompt_generator.py": [ - "Prompt Generator" - ], "https://github.com/andersxa/comfyui-PromptAttention": [ "CLIPAttentionMaskEncode" ], "https://github.com/asagi4/comfyui-prompt-control": [ "ConditioningCutoff", "EditableCLIPEncode", - "LoRAScheduler" + "FilterSchedule", + "JinjaRender", + "LoRAScheduler", + "PromptToSchedule", + "ScheduleToCond", + "ScheduleToModel", + "StringConcat" ], "https://github.com/bash-j/mikey_nodes": [ "Batch Resize Image for SDXL", @@ -1216,6 +1223,7 @@ "trRouterLonger" ], "https://github.com/tudal/Hakkun-ComfyUI-nodes/raw/main/hakkun_nodes.py": [ + "Any Converter", "Calculate Upscale", "Image size to string", "Multi Text Merge",