From 0dc903ac0435a17e1c2cfd2e154ed945931ff74f Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Thu, 22 Jun 2023 09:17:39 +0900 Subject: [PATCH] support uninstall.py script when git-clone uninstall update DB --- __init__.py | 10 +++++++++- custom-node-list.json | 12 +++++++++++- extension-node-map.json | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 3f73ed5..01319d3 100644 --- a/__init__.py +++ b/__init__.py @@ -16,7 +16,7 @@ sys.path.append('../..') from torchvision.datasets.utils import download_url # ensure .js -print("### Loading: ComfyUI-Manager (V0.9)") +print("### Loading: ComfyUI-Manager (V0.10)") comfy_path = os.path.dirname(folder_paths.__file__) custom_nodes_path = os.path.join(comfy_path, 'custom_nodes') @@ -550,6 +550,14 @@ def gitclone_uninstall(files): print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'") return False + install_script_path = os.path.join(dir_path, "uninstall.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.") + 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 660c741..140ce40 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -465,6 +465,16 @@ "install_type": "git-clone", "description": "ComfyUI nodes for the Ultimate Stable Diffusion Upscale script by Coyote-A." }, + { + "author": "ssitu", + "title": "NestedNodeBuilder", + "reference": "https://github.com/ssitu/ComfyUI_NestedNodeBuilder", + "files": [ + "https://github.com/ssitu/ComfyUI_NestedNodeBuilder" + ], + "install_type": "git-clone", + "description": "This extension provides the ability to combine multiple nodes into a single node." + }, { "author": "space-nuko", "title": "Disco Diffusion", @@ -578,7 +588,7 @@ { "author": "ailex000", "title": "Image Gallery", - "reference": "https://github.com/AlekPet/comfyui_translate_clip_text_encode_node", + "reference": "https://github.com/ailex000/ComfyUI-Extensions", "js_path": "image-gallery", "files": [ "https://github.com/ailex000/ComfyUI-Extensions/raw/main/image-gallery/imageGallery.js" diff --git a/extension-node-map.json b/extension-node-map.json index 4a106e3..8eee9f0 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -191,6 +191,8 @@ "Lerp", "PromptSchedule", "PromptScheduleGLIGEN", + "PromptScheduleNodeFlow", + "PromptScheduleNodeFlowEnd", "SawtoothWave", "SinWave", "SquareWave", @@ -289,6 +291,7 @@ "ImageDrawRectangleRoundedByContainer", "ImageEffectsAdjustment", "ImageEffectsGrayscale", + "ImageEffectsLensBokeh", "ImageEffectsLensChromaticAberration", "ImageEffectsLensOpticAxis", "ImageEffectsLensVignette",