OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-05-22 11:43:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix various bugs including refresh bug.

Browse Source
This commit is contained in:
Sj-Si 2024-01-18 12:13:33 -05:00
parent 50e444fa1d
commit 69f4f148dc
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/extraNetworks.js
View File

@ -55,8 +55,11 @@ function setupExtraNetworksForTab(tabname) {
if (searchOnly && searchTerm.length < 4) { if (searchOnly && searchTerm.length < 4) {
visible = false; visible = false;
} }
if (visible) {
elem.style.display = visible ? "" : "none"; elem.classList.remove("hidden");
} else {
elem.classList.add("hidden");
}
}); });
applySort(); applySort();

31
modules/ui_extra_networks.py
View File

@ -216,22 +216,17 @@ class ExtraNetworksPage:
Can be empty if the item is not meant to be shown. Can be empty if the item is not meant to be shown.
If no template is passed: A dictionary containing the generated item's attributes. If no template is passed: A dictionary containing the generated item's attributes.
""" """
metadata = item.get("metadata")
if metadata:
self.metadata[item["name"]] = metadata
if "user_metadata" not in item:
self.read_user_metadata(item)
preview = item.get("preview", None) preview = item.get("preview", None)
height = f"height: {shared.opts.extra_networks_card_height}px;" if shared.opts.extra_networks_card_height else '' style_height = f"height: {shared.opts.extra_networks_card_height}px;" if shared.opts.extra_networks_card_height else ''
width = f"width: {shared.opts.extra_networks_card_width}px;" if shared.opts.extra_networks_card_width else '' style_width = f"width: {shared.opts.extra_networks_card_width}px;" if shared.opts.extra_networks_card_width else ''
style_font_size = f"font-size: {shared.opts.extra_networks_card_text_scale*100}%;"
card_style = style_height + style_width + style_font_size
background_image = f'<img src="{html.escape(preview)}" class="preview" loading="lazy">' if preview else '' background_image = f'<img src="{html.escape(preview)}" class="preview" loading="lazy">' if preview else ''
onclick = item.get("onclick", None) onclick = item.get("onclick", None)
if onclick is None: if onclick is None:
# Don't quote prompt/neg_prompt since they are stored as js strings already. # Don't quote prompt/neg_prompt since they are stored as js strings already.
onclick_js_tpl = "cardClicked('{tabname}', {prompt}, {neg_prompt}, '{allow_neg}');" onclick_js_tpl = "cardClicked('{tabname}', {prompt}, {neg_prompt}, {allow_neg});"
onclick = onclick_js_tpl.format( onclick = onclick_js_tpl.format(
**{ **{
"tabname": tabname, "tabname": tabname,
@ -286,11 +281,10 @@ class ExtraNetworksPage:
).strip() ).strip()
search_terms_html = "" search_terms_html = ""
search_term_template = "<span style='{style}' class='{class}'>{search_term}</span>" search_term_template = "<span class='hidden {class}'>{search_term}</span>"
for search_term in item.get("search_terms", []): for search_term in item.get("search_terms", []):
search_terms_html += search_term_template.format( search_terms_html += search_term_template.format(
**{ **{
"style": "display: none;",
"class": f"search_terms{' search_only' if search_only else ''}", "class": f"search_terms{' search_only' if search_only else ''}",
"search_term": search_term, "search_term": search_term,
} }
@ -301,7 +295,7 @@ class ExtraNetworksPage:
"background_image": background_image, "background_image": background_image,
"card_clicked": onclick, "card_clicked": onclick,
"copy_path_button": btn_copy_path, "copy_path_button": btn_copy_path,
"description": (item.get("description") or "" if shared.opts.extra_networks_card_show_desc else ""), "description": (item.get("description", "") or "" if shared.opts.extra_networks_card_show_desc else ""),
"edit_button": btn_edit_item, "edit_button": btn_edit_item,
"local_preview": quote_js(item["local_preview"]), "local_preview": quote_js(item["local_preview"]),
"metadata_button": btn_metadata, "metadata_button": btn_metadata,
@ -311,7 +305,7 @@ class ExtraNetworksPage:
"search_only": " search_only" if search_only else "", "search_only": " search_only" if search_only else "",
"search_terms": search_terms_html, "search_terms": search_terms_html,
"sort_keys": sort_keys, "sort_keys": sort_keys,
"style": f"display: none; {height}{width}; font-size: {shared.opts.extra_networks_card_text_scale*100}%", "style": card_style,
"tabname": tabname, "tabname": tabname,
"extra_networks_tabname": self.extra_networks_tabname, "extra_networks_tabname": self.extra_networks_tabname,
} }
@ -500,7 +494,6 @@ class ExtraNetworksPage:
HTML formatted string. HTML formatted string.
""" """
res = "" res = ""
self.items = {x["name"]: x for x in self.list_items()}
for item in self.items.values(): for item in self.items.values():
res += self.create_item_html(tabname, item, self.card_tpl) res += self.create_item_html(tabname, item, self.card_tpl)
@ -524,6 +517,14 @@ class ExtraNetworksPage:
self.lister.reset() self.lister.reset()
self.metadata = {} self.metadata = {}
self.items = {x["name"]: x for x in self.list_items()} self.items = {x["name"]: x for x in self.list_items()}
# Populate the instance metadata for each item.
for item in self.items.values():
metadata = item.get("metadata")
if metadata:
self.metadata[item["name"]] = metadata
if "user_metadata" not in item:
self.read_user_metadata(item)
return self.pane_tpl.format( return self.pane_tpl.format(
**{ **{