mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2025-12-18 19:03:06 +08:00
Merge branch 'main' into draft-v4
This commit is contained in:
commit
7a35bd9d9a
@ -1326,8 +1326,7 @@ class UnifiedManager:
|
|||||||
return result.fail(f'Path not found: {repo_path}')
|
return result.fail(f'Path not found: {repo_path}')
|
||||||
|
|
||||||
# version check
|
# version check
|
||||||
repo = git.Repo(repo_path)
|
with git.Repo(repo_path) as repo:
|
||||||
|
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
if not switch_to_default_branch(repo):
|
if not switch_to_default_branch(repo):
|
||||||
return result.fail(f"Failed to switch to default branch: {repo_path}")
|
return result.fail(f"Failed to switch to default branch: {repo_path}")
|
||||||
@ -2654,22 +2653,8 @@ async def get_current_snapshot(custom_nodes_only = False):
|
|||||||
|
|
||||||
cnr_custom_nodes[info['id']] = info['ver']
|
cnr_custom_nodes[info['id']] = info['ver']
|
||||||
else:
|
else:
|
||||||
repo = git.Repo(fullpath)
|
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||||
|
url = git_utils.git_url(fullpath)
|
||||||
if repo.head.is_detached:
|
|
||||||
remote_name = get_remote_name(repo)
|
|
||||||
else:
|
|
||||||
current_branch = repo.active_branch
|
|
||||||
|
|
||||||
if current_branch.tracking_branch() is None:
|
|
||||||
remote_name = get_remote_name(repo)
|
|
||||||
else:
|
|
||||||
remote_name = current_branch.tracking_branch().remote_name
|
|
||||||
|
|
||||||
commit_hash = repo.head.commit.hexsha
|
|
||||||
|
|
||||||
url = repo.remotes[remote_name].url
|
|
||||||
|
|
||||||
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
||||||
except:
|
except:
|
||||||
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
||||||
|
|||||||
@ -9035,15 +9035,9 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/Shiba-2-shiba/comfyui-color-ascii-art-node": [
|
"https://github.com/Shiba-2-shiba/comfyui-color-ascii-art-node": [
|
||||||
[
|
[
|
||||||
"ASCIIArtNode",
|
"ASCIIArtNodeV3"
|
||||||
"ASCIIArtNodev2",
|
|
||||||
"ASCIIArtSinglefontNode"
|
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"author": "Shiba-2-shiba",
|
|
||||||
"description": "This node generates colorful ASCII art using custom character sets and fonts.",
|
|
||||||
"nickname": "ColorASCII",
|
|
||||||
"title": "Colorful ASCII Art Node",
|
|
||||||
"title_aux": "ComfyUI-color-ascii-art-node"
|
"title_aux": "ComfyUI-color-ascii-art-node"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@ -9035,15 +9035,9 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/Shiba-2-shiba/comfyui-color-ascii-art-node": [
|
"https://github.com/Shiba-2-shiba/comfyui-color-ascii-art-node": [
|
||||||
[
|
[
|
||||||
"ASCIIArtNode",
|
"ASCIIArtNodeV3"
|
||||||
"ASCIIArtNodev2",
|
|
||||||
"ASCIIArtSinglefontNode"
|
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"author": "Shiba-2-shiba",
|
|
||||||
"description": "This node generates colorful ASCII art using custom character sets and fonts.",
|
|
||||||
"nickname": "ColorASCII",
|
|
||||||
"title": "Colorful ASCII Art Node",
|
|
||||||
"title_aux": "ComfyUI-color-ascii-art-node"
|
"title_aux": "ComfyUI-color-ascii-art-node"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user