TBNilles/ComfyUI-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve: add preemptions for custom nodes

Browse Source 
- better nickname displays for badge

fix: If the missing node is included in multiple custom node packs, it reports all the custom node packs.
This commit is contained in:
dr.lt.data
2024-02-26 13:26:37 +09:00
parent b013eaa7c9
commit ef24e2cee6
8 changed files with 133 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/comfyui-manager.js
View File

@@ -147,13 +147,13 @@ docStyle.innerHTML = `
}
.cm-notice-board > ul {
display: block;
list-style-type: disc;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0px;
margin-inline-end: 0px;
padding-inline-start: 40px;
display: block;
list-style-type: disc;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0px;
margin-inline-end: 0px;
padding-inline-start: 40px;
}
.cm-conflicted-nodes-text {
@@ -378,7 +378,7 @@ await init_badge_mode();
await init_share_option();
async function fetchNicknames() {
const response1 = await api.fetchApi(`/customnode/getmappings?mode=local`);
const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
const mappings = await response1.json();
let result = {};

21
js/custom-nodes-downloader.js
View File

@@ -154,7 +154,6 @@ export class CustomNodesInstaller extends ComfyDialog {
async filter_missing_node(data) {
const mappings = await getCustomnodeMappings();
// build regex->url map
const regex_to_url = [];
for (let i in data) {
@@ -165,11 +164,17 @@ export class CustomNodesInstaller extends ComfyDialog {
}
// build name->url map
const name_to_url = {};
const name_to_urls = {};
for (const url in mappings) {
const names = mappings[url];
for(const name in names[0]) {
name_to_url[names[0][name]] = url;
let v = name_to_urls[names[0][name]];
if(v == undefined) {
v = [];
name_to_urls[names[0][name]] = v;
}
v.push(url);
}
}
@@ -194,9 +199,11 @@ export class CustomNodesInstaller extends ComfyDialog {
continue;
if (!registered_nodes.has(node_type)) {
const url = name_to_url[node_type.trim()];
if(url)
missing_nodes.add(url);
const urls = name_to_urls[node_type.trim()];
if(urls)
urls.forEach(url => {
missing_nodes.add(url);
});
else {
for(let j in regex_to_url) {
if(regex_to_url[j].regex.test(node_type)) {
@@ -210,7 +217,7 @@ export class CustomNodesInstaller extends ComfyDialog {
let unresolved_nodes = await getUnresolvedNodesInComponent();
for (let i in unresolved_nodes) {
let node_type = unresolved_nodes[i];
const url = name_to_url[node_type];
const url = name_to_urls[node_type];
if(url)
missing_nodes.add(url);
}