nodes/Azornes-Comfyui-Model-Resolver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: persist download target subfolder selections and add suggest button

Browse Source
This commit is contained in:
Dariusz L
2026-06-06 18:18:58 +02:00
parent 541881ce49
commit 7bd1b9ad33
5 changed files with 122 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
metadata/huggingface-author-index.json
+1 -1
View File
File diff suppressed because one or more lines are too long
web/css/resolver-main.css
+17
View File
@@ -4136,6 +4136,23 @@
min-width: 0;
width: 100%;
}
.mr-download-subfolder-control {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 6px;
width: 100%;
min-width: 0;
}
.mr-download-suggest-btn,
#model-resolver-modal .mr-download-suggest-btn {
min-width: 58px;
height: var(--mr-download-control-height, 36px);
min-height: var(--mr-download-control-height, 36px);
padding: 0 9px;
border-radius: var(--mr-missing-control-radius, 7px);
font-size: 11px;
line-height: 1;
}
@media (max-width: 720px) {
.mr-download-target-label {
min-height: 0;
web/resolver/resolver_dialog.js
+1
View File
@@ -22,6 +22,7 @@ export class ResolverManagerDialog extends ComfyDialog {
this.downloadDirectories = null;
this.capabilities = null;
this.downloadSubfolders = new Map();
this.downloadTargetSelections = new Map(); // missing model key -> user/suggested download target
this.pendingResolutions = [];
this.pendingIndex = new Map(); // key -> index in pendingResolutions
this.workflowPendingSelections = new Map(); // workflow key -> queued selections
web/resolver/search/download_target_methods.js
+102 -6
View File
@@ -186,6 +186,28 @@ export const downloadTargetMethods = {
return this.downloadSubfolders.get((category || '').toLowerCase()) || [];
},
getDownloadTargetKey(missing = {}) {
return this.getMissingModelKey?.(missing)
|| `${missing.node_id}:${missing.widget_index}:${missing.subgraph_id || ''}:${missing.is_top_level !== false ? 'T' : 'F'}`;
},
getSavedDownloadTargetSelection(missing = {}) {
const key = this.getDownloadTargetKey(missing);
return this.downloadTargetSelections?.get(key) || null;
},
saveDownloadTargetSelection(missing = {}, patch = {}) {
if (!this.downloadTargetSelections) {
this.downloadTargetSelections = new Map();
}
const key = this.getDownloadTargetKey(missing);
const current = this.downloadTargetSelections.get(key) || {};
this.downloadTargetSelections.set(key, {
...current,
...patch
});
},
normalizeFolderToken(value = '') {
return String(value || '')
.toLowerCase()
@@ -253,14 +275,44 @@ export const downloadTargetMethods = {
async applySuggestedCivitaiSubfolder(missing, categoryEl, subfolderEl) {
if (!categoryEl || !subfolderEl || subfolderEl.value.trim()) return;
const saved = this.getSavedDownloadTargetSelection(missing);
if (saved?.subfolderTouched) return;
const category = this.getDropdownValue(categoryEl);
await this.ensureDownloadSubfoldersLoaded(category);
const latestSaved = this.getSavedDownloadTargetSelection(missing);
if (latestSaved?.subfolderTouched || subfolderEl.value.trim()) return;
const folders = this.getAvailableSubfolders(category);
const suggestion = this.getSuggestedCivitaiSubfolder(missing, category, folders);
if (suggestion) {
subfolderEl.value = suggestion;
this.saveDownloadTargetSelection(missing, {
category,
subfolder: suggestion,
subfolderTouched: false
});
}
},
async forceSuggestedCivitaiSubfolder(missing, categoryEl, subfolderEl) {
if (!categoryEl || !subfolderEl) return;
const category = this.getDropdownValue(categoryEl);
await this.ensureDownloadSubfoldersLoaded(category);
const folders = this.getAvailableSubfolders(category);
const suggestion = this.getSuggestedCivitaiSubfolder(missing, category, folders);
if (suggestion) {
subfolderEl.value = suggestion;
if (!suggestion) {
this.showNotification?.('No subfolder suggestion available for this model.', 'info');
return;
}
subfolderEl.value = suggestion;
this.saveDownloadTargetSelection(missing, {
category,
subfolder: suggestion,
subfolderTouched: true
});
},
applySearchResultSuggestion(missing) {
@@ -298,9 +350,12 @@ export const downloadTargetMethods = {
renderDownloadTargetControls(missing, defaultCategory = 'checkpoints') {
const selectId = `download-category-${missing.node_id}-${missing.widget_index}`;
const subfolderId = `download-subfolder-${missing.node_id}-${missing.widget_index}`;
const suggestId = `download-subfolder-suggest-${missing.node_id}-${missing.widget_index}`;
const categoryListId = `download-category-list-${missing.node_id}-${missing.widget_index}`;
const subfolderListId = `download-subfolder-list-${missing.node_id}-${missing.widget_index}`;
const selectedCategory = defaultCategory || 'checkpoints';
const saved = this.getSavedDownloadTargetSelection(missing);
const selectedCategory = saved?.category || defaultCategory || 'checkpoints';
const selectedSubfolder = saved ? saved.subfolder || '' : '';
let html = `<div class="mr-download-target">`;
html += `<div class="mr-download-target-grid">`;
@@ -311,7 +366,10 @@ export const downloadTargetMethods = {
html += `<div id="${categoryListId}" class="mr-download-target-list"></div>`;
html += `</div>`;
html += `<div class="mr-download-target-wrap">`;
html += `<input id="${subfolderId}" class="mr-download-target-input" type="text" placeholder="e.g. ponyxl\\styles" autocomplete="off">`;
html += `<div class="mr-download-subfolder-control">`;
html += `<input id="${subfolderId}" class="mr-download-target-input" type="text" placeholder="e.g. ponyxl\\styles" autocomplete="off" value="${this.escapeHtml(selectedSubfolder)}">`;
html += `<button id="${suggestId}" class="mr-btn mr-btn-secondary mr-btn-sm mr-download-suggest-btn" type="button" data-tooltip="Apply suggested subfolder">Suggest</button>`;
html += `</div>`;
html += `<div id="${subfolderListId}" class="mr-download-target-list"></div>`;
html += `</div>`;
html += `</div>`;
@@ -322,9 +380,15 @@ export const downloadTargetMethods = {
getDownloadTargetSelection(missing, fallbackCategory = 'checkpoints') {
const categoryEl = this.contentElement?.querySelector(`#download-category-${missing.node_id}-${missing.widget_index}`);
const subfolderEl = this.contentElement?.querySelector(`#download-subfolder-${missing.node_id}-${missing.widget_index}`);
const category = this.getDropdownValue(categoryEl) || fallbackCategory || 'checkpoints';
const subfolder = (subfolderEl?.value || '').trim();
this.saveDownloadTargetSelection(missing, {
category,
subfolder
});
return {
category: this.getDropdownValue(categoryEl) || fallbackCategory || 'checkpoints',
subfolder: (subfolderEl?.value || '').trim()
category,
subfolder
};
},
@@ -358,6 +422,7 @@ export const downloadTargetMethods = {
wireDownloadTargetAutocomplete(container, missing) {
const categoryEl = container.querySelector(`#download-category-${missing.node_id}-${missing.widget_index}`);
const subfolderEl = container.querySelector(`#download-subfolder-${missing.node_id}-${missing.widget_index}`);
const suggestBtn = container.querySelector(`#download-subfolder-suggest-${missing.node_id}-${missing.widget_index}`);
const categoryListEl = container.querySelector(`#download-category-list-${missing.node_id}-${missing.widget_index}`);
const listEl = container.querySelector(`#download-subfolder-list-${missing.node_id}-${missing.widget_index}`);
if (!categoryEl || !subfolderEl || !listEl) return;
@@ -411,6 +476,11 @@ export const downloadTargetMethods = {
renderOptions(categoryListEl, options, (value, label) => {
this.setDropdownValue(categoryEl, value, label);
subfolderEl.value = '';
this.saveDownloadTargetSelection(missing, {
category: value,
subfolder: '',
subfolderTouched: false
});
listEl.innerHTML = '';
listEl.style.display = 'none';
this.applySuggestedCivitaiSubfolder(missing, categoryEl, subfolderEl);
@@ -428,6 +498,11 @@ export const downloadTargetMethods = {
renderOptions(listEl, filtered, (value) => {
subfolderEl.value = value;
this.saveDownloadTargetSelection(missing, {
category: this.getDropdownValue(categoryEl),
subfolder: value,
subfolderTouched: true
});
});
};
@@ -455,10 +530,30 @@ export const downloadTargetMethods = {
});
subfolderEl.addEventListener('input', () => {
this.saveDownloadTargetSelection(missing, {
category: this.getDropdownValue(categoryEl),
subfolder: subfolderEl.value,
subfolderTouched: true
});
populateSubfolderOptions(subfolderEl.value);
});
subfolderEl.addEventListener('blur', () => hideList(listEl));
if (suggestBtn && suggestBtn.dataset.mlSuggestBound !== 'true') {
suggestBtn.dataset.mlSuggestBound = 'true';
suggestBtn.addEventListener('click', async () => {
suggestBtn.disabled = true;
try {
await this.forceSuggestedCivitaiSubfolder(missing, categoryEl, subfolderEl);
listEl.innerHTML = '';
listEl.style.display = 'none';
} finally {
suggestBtn.disabled = false;
}
});
}
this.applySuggestedCivitaiSubfolder(missing, categoryEl, subfolderEl);
},
@@ -581,6 +676,7 @@ export const downloadTargetMethods = {
this.downloadDirectories = null;
this.capabilities = null;
this.downloadSubfolders.clear();
this.downloadTargetSelections?.clear();
this._analysisProgressToken = null;
await this.ensureCapabilitiesLoaded();
web/resolver/shell/workflow_state_methods.js
+1
View File
@@ -311,6 +311,7 @@ export const workflowStateMethods = {
this.searchResultCache.clear();
this.urnResolvePromises.clear();
this.urnLocalMatchPromises.clear();
this.downloadTargetSelections?.clear();
this.pendingResolutions = [];
this.rebuildPendingIndex();
this.updateApplyPendingButton?.();