mirrors/stable-diffusion-webui
1
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2026-02-01 13:22:04 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix hidden directory options and their functionality.

Browse source
This commit is contained in:
Sj-Si 2024-05-03 18:18:02 -04:00
parent da204f8602
commit b497467436
5 changed files with 119 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javascript/extraNetworks.js
View file

@ -748,8 +748,12 @@ class ExtraNetworksTab {
await this.tree_list.onRowSelected();
}
// Don't use escaped path here since this is pure javascript beyond this point.
let directory_filter = source_elem.dataset.path;
if ("directoryFilterOverride" in source_elem.dataset) {
directory_filter = source_elem.dataset.directoryFilterOverride;
}
this.applyDirectoryFilter(
"selected" in source_elem.dataset ? source_elem.dataset.path : null,
"selected" in source_elem.dataset ? directory_filter : null,
"recurse" in source_elem.dataset,
);
return;
@ -770,8 +774,12 @@ class ExtraNetworksTab {
const div_id = source_is_tree ? source_elem.dataset.divId : other_elem.dataset.divId;
_set_recursion_depth(div_id, data_recurse);
// Don't use escaped path here since this is pure javascript beyond this point.
let directory_filter = source_elem.dataset.path;
if ("directoryFilterOverride" in source_elem.dataset) {
directory_filter = source_elem.dataset.directoryFilterOverride;
}
this.applyDirectoryFilter(
"selected" in source_elem.dataset ? source_elem.dataset.path : null,
"selected" in source_elem.dataset ? directory_filter : null,
"recurse" in source_elem.dataset,
);
}

20
javascript/extraNetworksClusterize.js
View file

@ -581,28 +581,26 @@ class ExtraNetworksClusterizeCardsList extends ExtraNetworksClusterize {
if (this.directory_filter_str && this.directory_filter_recurse) {
// Filter as directory with recurse shows all nested children.
// Case sensitive comparison against the relative directory of each object.
this.data_obj[div_id].visible = v.rel_parent_dir.startsWith(this.directory_filter_str);
if (!this.data_obj[div_id].visible) {
v.visible = v.rel_parent_dir.startsWith(this.directory_filter_str);
if (!v.visible) {
continue;
}
} else {
// Filtering as directory without recurse only shows direct children.
// Case sensitive comparison against the relative directory of each object.
if (this.directory_filter_str && this.directory_filter_str !== v.rel_parent_dir) {
this.data_obj[div_id].visible = false;
v.visible = false;
continue;
}
}
if (v.search_only && this.filter_str.length >= 4) {
if (v.search_only) {
// Custom filter for items marked search_only=true.
// TODO: Not ideal. This disregards any search_terms set on the model.
// However the search terms are currently set up in a way that would
// reveal hidden models if the user searches for any visible parent
// directories. For example, searching for "Lora" would reveal a hidden
// model in "Lora/.hidden/model.safetensors" since that full path is
// included in the search terms.
visible = v.rel_parent_dir.toLowerCase().indexOf(this.filter_str.toLowerCase()) !== -1;
if (this.directory_filter_str || this.filter_str.length >= 4) {
visible = v.search_terms.toLowerCase().indexOf(this.filter_str.toLowerCase()) !== -1;
} else {
visible = false;
}
} else {
// All other filters treated case insensitive.
visible = v.search_terms.toLowerCase().indexOf(this.filter_str.toLowerCase()) !== -1;