diff --git a/glob/manager_core.py b/glob/manager_core.py index ac4fb33d..743db0f5 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -1141,7 +1141,7 @@ class UnifiedManager: manager_util.download_url(node_info.download_url, custom_nodes_path, archive_name) os.makedirs(install_path, exist_ok=True) - extracted = cnr_utils.extract_package_as_zip(download_path, install_path) + extracted = manager_util.extract_package_as_zip(download_path, install_path) os.remove(download_path) result.to_path = install_path @@ -1694,6 +1694,7 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa :param path: path to git custom node :param do_fetch: do fetch during check :param do_update: do update during check + :param no_deps: don't install dependencies :return: update state * success """ if do_fetch: @@ -1816,7 +1817,7 @@ def is_valid_url(url): return True finally: # Check for SSH git URL format - pattern = re.compile(r"^(.+@|ssh:\/\/).+:.+$") + pattern = re.compile(r"^(.+@|ssh://).+:.+$") if pattern.match(url): return True return False diff --git a/js/custom-nodes-manager.js b/js/custom-nodes-manager.js index 487f920d..7c0af9df 100644 --- a/js/custom-nodes-manager.js +++ b/js/custom-nodes-manager.js @@ -1167,15 +1167,15 @@ export class CustomNodesManager { let version_cnt = 0; if(!is_enable) { - if(rowItem.cnr_latest != rowItem.originalData.active_version) { - versions.push('latest'); - } - if(rowItem.originalData.active_version != 'nightly') { versions.push('nightly'); default_version = 'nightly'; version_cnt++; } + + if(rowItem.cnr_latest != rowItem.originalData.active_version) { + versions.push('latest'); + } } for(let v of obj) { @@ -1186,15 +1186,9 @@ export class CustomNodesManager { } } - if(version_cnt == 1) { - // if only one version is available - this.installNodes([hash], btn, title, default_version); - } - else { - this.showVersionSelectorDialog(versions, (selected_version) => { - this.installNodes([hash], btn, title, selected_version); - }); - } + this.showVersionSelectorDialog(versions, (selected_version) => { + this.installNodes([hash], btn, title, selected_version); + }); } else { show_message('Failed to fetch versions from ComfyRegistry.');