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

Fix various filtering/sorting bugs

Browse source
This commit is contained in:
Sj-Si 2024-04-22 14:01:19 -04:00
parent 42e61d5d90
commit 7c2446c73c
5 changed files with 81 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javascript/clusterize.js
View file

@ -198,16 +198,8 @@ class Clusterize {
this.#max_items = max_items;
return this.#max_items !== max_items;
}
if (this.#max_items === max_items) {
// No change. do nothing.
return false;
}
// If the number of items changed, we need to update the cluster.
this.#max_items = max_items;
await this.refresh();
// Apply sort to the updated data.
await this.sortData();
return true;
}
// ==== PRIVATE FUNCTIONS ====
@ -266,6 +258,8 @@ class Clusterize {
// Filter is applied to entire dataset.
const max_items = await this.options.callbacks.filterData();
await this.setMaxItems(max_items);
await this.refresh(true);
await this.sortData();
}
#exploreEnvironment(rows, cache) {

24
javascript/extraNetworks.js
View file

@ -128,7 +128,7 @@ class ExtraNetworksTab {
this.setSortMode(sort_mode_elem.dataset.sortMode);
this.setSortDir(sort_dir_elem.dataset.sortDir);
this.setFilterStr(this.txt_search_elem.value.toLowerCase());
this.setFilterStr(this.txt_search_elem.value);
this.registerPrompt();
@ -214,9 +214,9 @@ class ExtraNetworksTab {
this.cards_list.setSortDir(this.sort_dir_str);
}
setFilterStr(filter_str) {
setFilterStr(filter_str, is_dir) {
this.filter_str = filter_str;
this.cards_list.setFilterStr(this.filter_str);
this.cards_list.setFilterStr(this.filter_str, is_dir === true);
}
movePrompt(show_prompt = true, show_neg_prompt = true) {
@ -310,9 +310,9 @@ class ExtraNetworksTab {
this.cards_list.enable(false);
}
applyFilter() {
applyFilter({is_dir = false} = {is_dir: false}) {
// We only want to filter/sort the cards list.
this.setFilterStr(this.txt_search_elem.value.toLowerCase());
this.setFilterStr(this.txt_search_elem.value, is_dir);
// If the search input has changed since selecting a button to populate it
// then we want to disable the button that previously populated the search input.
@ -460,10 +460,10 @@ class ExtraNetworksTab {
}
}
updateSearch(text) {
updateSearch(text, ...args) {
this.txt_search_elem.value = text;
updateInput(this.txt_search_elem);
this.applyFilter();
this.applyFilter(...args);
}
autoSetTreeWidth() {
@ -761,7 +761,7 @@ function extraNetworksBtnDirsViewItemOnClick(event, tabname_full) {
_deselect_all_buttons();
// update search input with selected button's path.
elem.dataset.selected = "";
txt_search_elem.value = elem.textContent.trim();
tab.updateSearch(elem.textContent.trim(), {is_dir: true});
// Select the corresponding tree view button.
if ("selected" in elem.dataset) {
@ -774,7 +774,7 @@ function extraNetworksBtnDirsViewItemOnClick(event, tabname_full) {
const _deselect_button = (elem) => {
delete elem.dataset.selected;
txt_search_elem.value = "";
tab.updateSearch("");
// deselect tree view rows
tab.tree_list.onRowSelected(); // empty params deselects all rows.
};
@ -785,9 +785,6 @@ function extraNetworksBtnDirsViewItemOnClick(event, tabname_full) {
_select_button(event.target);
}
updateInput(txt_search_elem);
tab.applyFilter();
event.stopPropagation();
}
@ -960,7 +957,8 @@ function extraNetworksTreeDirectoryOnClick(event, btn, tabname_full) {
});
}
tab.updateSearch("selected" in btn.dataset ? btn.dataset.path : "");
const search_txt = "selected" in btn.dataset ? btn.dataset.path : "";
tab.updateSearch(search_txt, {is_dir: btn.dataset.treeEntryType === "dir" && search_txt !== ""});
}
const selected_elem = gradioApp().querySelector(".tree-list-item[data-selected='']");
if (isElement(prev_selected_elem) && !isElement(selected_elem)) {

62
javascript/extraNetworksClusterize.js
View file

@ -40,6 +40,8 @@ class ExtraNetworksClusterize extends Clusterize {
tabname = "";
extra_networks_tabname = "";
filter_as_dir = false;
// Override base class defaults
default_sort_mode_str = "divId";
default_sort_dir_str = "ascending";
@ -64,6 +66,7 @@ class ExtraNetworksClusterize extends Clusterize {
// can't use super class' sort since it relies on setup being run first.
// but we do need to make sure to sort the new data before continuing.
await this.setMaxItems(Object.keys(this.data_obj).length);
await this.refresh(true);
await this.options.callbacks.sortData();
}
@ -138,15 +141,14 @@ class ExtraNetworksClusterize extends Clusterize {
this.sortData();
}
setFilterStr(filter_str) {
if (isString(filter_str) && this.filter_str !== filter_str.toLowerCase()) {
this.filter_str = filter_str.toLowerCase();
} else if (isNullOrUndefined(this.filter_str)) {
this.filter_str = this.default_filter_str.toLowerCase();
} else {
return;
setFilterStr(filter_str, is_dir) {
if (isString(filter_str) && this.filter_str !== filter_str) {
this.filter_str = filter_str;
} else if (isNullOrUndefined(filter_str)) {
this.filter_str = this.default_filter_str;
}
this.filter_as_dir = is_dir === true;
this.filterData();
}
@ -358,10 +360,9 @@ class ExtraNetworksClusterizeTreeList extends ExtraNetworksClusterize {
}
const new_len = Object.values(this.data_obj).filter(v => v.visible).length;
const max_items_changed = await this.setMaxItems(new_len);
if (!max_items_changed) {
await this.refresh(true);
}
await this.setMaxItems(new_len);
await this.refresh(true);
await this.sortData();
}
async onCollapseAllClick(div_id) {
@ -384,10 +385,9 @@ class ExtraNetworksClusterizeTreeList extends ExtraNetworksClusterize {
}
const new_len = Object.values(this.data_obj).filter(v => v.visible).length;
const max_items_changed = await this.setMaxItems(new_len);
if (!max_items_changed) {
await this.refresh(true);
}
await this.setMaxItems(new_len);
await this.refresh(true);
await this.sortData();
}
async onRowExpandClick(div_id, elem) {
@ -405,10 +405,9 @@ class ExtraNetworksClusterizeTreeList extends ExtraNetworksClusterize {
}
const new_len = Object.values(this.data_obj).filter(v => v.visible).length;
const max_items_changed = await this.setMaxItems(new_len);
if (!max_items_changed) {
await this.refresh(true);
}
await this.setMaxItems(new_len);
await this.refresh(true);
await this.sortData();
}
async initData() {
@ -493,7 +492,10 @@ class ExtraNetworksClusterizeCardsList extends ExtraNetworksClusterize {
sortByPath(data) {
return Object.keys(data).sort((a, b) => {
return STR_COLLATOR.compare(data[a].sort_path, data[b].sort_path);
// Wrap the paths in File objects to allow for proper sorting of filepaths.
const a_file = new File([""], data[a].sort_path);
const b_file = new File([""], data[b].sort_path);
return a_file - b_file;
});
}
@ -586,7 +588,24 @@ class ExtraNetworksClusterizeCardsList extends ExtraNetworksClusterize {
/** Filters data by a string and returns number of items after filter. */
let n_visible = 0;
for (const [div_id, v] of Object.entries(this.data_obj)) {
let visible = v.search_terms.toLowerCase().indexOf(this.filter_str) != -1;
let visible;
if (this.filter_str && this.filter_as_dir) {
// Filtering as directory only shows direct children. Case sensitive
// comparison against the relative directory of each object.
visible = this.filter_str === v.rel_parent_dir;
} else if (v.search_only && this.filter_str.length >= 4) {
// 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;
} else {
// All other filters treated case insensitive.
visible = v.search_terms.toLowerCase().indexOf(this.filter_str.toLowerCase()) !== -1;
}
if (v.search_only && this.filter_str.length < 4) {
visible = false;
}
@ -595,7 +614,6 @@ class ExtraNetworksClusterizeCardsList extends ExtraNetworksClusterize {
n_visible++;
}
}
return n_visible;
}
}