Browse Source

improve: try execute disable.py if uninstall.py not exists

update DB
pull/46/head
dr.lt.data 1 year ago
parent
commit
2c2de008a9
  1. 10
      __init__.py
  2. 10
      custom-node-list.json
  3. 16
      extension-node-map.json

10
__init__.py

@ -33,7 +33,7 @@ sys.path.append('../..')
from torchvision.datasets.utils import download_url from torchvision.datasets.utils import download_url
# ensure .js # ensure .js
print("### Loading: ComfyUI-Manager (V0.17.1)") print("### Loading: ComfyUI-Manager (V0.17.2)")
comfy_ui_revision = "Unknown" comfy_ui_revision = "Unknown"
@ -679,18 +679,24 @@ def gitclone_uninstall(files):
dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "") dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
dir_path = os.path.join(custom_nodes_path, dir_name) dir_path = os.path.join(custom_nodes_path, dir_name)
# safey check # safety check
if dir_path == '/' or dir_path[1:] == ":/" or dir_path == '': if dir_path == '/' or dir_path[1:] == ":/" or dir_path == '':
print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'") print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'")
return False return False
install_script_path = os.path.join(dir_path, "uninstall.py") 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): if os.path.exists(install_script_path):
uninstall_cmd = [sys.executable, "uninstall.py"] uninstall_cmd = [sys.executable, "uninstall.py"]
code = subprocess.run(uninstall_cmd, cwd=dir_path) code = subprocess.run(uninstall_cmd, cwd=dir_path)
if code.returncode != 0: if code.returncode != 0:
print(f"An error occurred during the execution of the uninstall.py script. Only the '{dir_path}' will be deleted.") 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): if os.path.exists(dir_path):
rmtree(dir_path) rmtree(dir_path)

10
custom-node-list.json

@ -858,6 +858,16 @@
"install_type": "git-clone", "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" "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", "author": "taabata",
"title": "Syrian Falcon Nodes", "title": "Syrian Falcon Nodes",

16
extension-node-map.json

@ -398,6 +398,7 @@
"https://github.com/RockOfFire/ComfyUI_Comfyroll_CustomNodes": [ "https://github.com/RockOfFire/ComfyUI_Comfyroll_CustomNodes": [
"CR Apply ControlNet", "CR Apply ControlNet",
"CR Aspect Ratio", "CR Aspect Ratio",
"CR Aspect Ratio SDXL",
"CR Clip Input Switch", "CR Clip Input Switch",
"CR Color Tint", "CR Color Tint",
"CR Conditioning Input Switch", "CR Conditioning Input Switch",
@ -417,6 +418,8 @@
"CR Module Output", "CR Module Output",
"CR Module Pipe Loader", "CR Module Pipe Loader",
"CR Pipe Switch", "CR Pipe Switch",
"CR Prompt Mixer",
"CR SDXL Prompt Mixer",
"CR Seed to Int" "CR Seed to Int"
], ],
"https://github.com/SLAPaper/ComfyUI-Image-Selector": [ "https://github.com/SLAPaper/ComfyUI-Image-Selector": [
@ -444,6 +447,7 @@
"SeargePromptCombiner", "SeargePromptCombiner",
"SeargePromptText", "SeargePromptText",
"SeargeSDXLBasePromptEncoder", "SeargeSDXLBasePromptEncoder",
"SeargeSDXLImage2ImageSampler",
"SeargeSDXLPromptEncoder", "SeargeSDXLPromptEncoder",
"SeargeSDXLRefinerPromptEncoder", "SeargeSDXLRefinerPromptEncoder",
"SeargeSDXLSampler" "SeargeSDXLSampler"
@ -686,16 +690,19 @@
"DPMagicPrompt", "DPMagicPrompt",
"DPRandomGenerator" "DPRandomGenerator"
], ],
"https://github.com/alpertunga-bile/prompt-generator-comfyui/raw/master/prompt_generator.py": [
"Prompt Generator"
],
"https://github.com/andersxa/comfyui-PromptAttention": [ "https://github.com/andersxa/comfyui-PromptAttention": [
"CLIPAttentionMaskEncode" "CLIPAttentionMaskEncode"
], ],
"https://github.com/asagi4/comfyui-prompt-control": [ "https://github.com/asagi4/comfyui-prompt-control": [
"ConditioningCutoff", "ConditioningCutoff",
"EditableCLIPEncode", "EditableCLIPEncode",
"LoRAScheduler" "FilterSchedule",
"JinjaRender",
"LoRAScheduler",
"PromptToSchedule",
"ScheduleToCond",
"ScheduleToModel",
"StringConcat"
], ],
"https://github.com/bash-j/mikey_nodes": [ "https://github.com/bash-j/mikey_nodes": [
"Batch Resize Image for SDXL", "Batch Resize Image for SDXL",
@ -1216,6 +1223,7 @@
"trRouterLonger" "trRouterLonger"
], ],
"https://github.com/tudal/Hakkun-ComfyUI-nodes/raw/main/hakkun_nodes.py": [ "https://github.com/tudal/Hakkun-ComfyUI-nodes/raw/main/hakkun_nodes.py": [
"Any Converter",
"Calculate Upscale", "Calculate Upscale",
"Image size to string", "Image size to string",
"Multi Text Merge", "Multi Text Merge",

Loading…
Cancel
Save