1580158
/
Stable-Diffusion-Webui-Civitai-Helper
mirror of https://github.com/butaixianran/Stable-Diffusion-Webui-Civitai-Helper.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update for basic compatibility with sd-webui-v1.5

pull/232/head
Zixaphir 2023-07-24 13:06:10 -07:00
parent 778876dcd0
commit 6f95dd201a
2 changed files with 74 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
javascript/civitai_helper.js
View File

@ -19,7 +19,7 @@ function ch_gradio_version(){
let versions = foot.querySelector(".versions"); let versions = foot.querySelector(".versions");
if (!versions){return null;} if (!versions){return null;}
if (versions.innerHTML.indexOf("gradio: 3.16.2")>0) { if (versions.textContent.indexOf("gradio: 3.16.2")>0) {
return "3.16.2"; return "3.16.2";
} else { } else {
return "3.23.0"; return "3.23.0";
@ -493,7 +493,9 @@ onUiLoaded(() => {
extra_network_id = tab_prefix+"_"+js_model_type+"_"+cardid_suffix; extra_network_id = tab_prefix+"_"+js_model_type+"_"+cardid_suffix;
// console.log("searching extra_network_node: " + extra_network_id); // console.log("searching extra_network_node: " + extra_network_id);
extra_network_node = gradioApp().getElementById(extra_network_id); extra_network_node = gradioApp().getElementById(extra_network_id);
// check if extr network is under thumbnail mode // check if extr network is under thumbnail mode
// XXX thumbnail mode removed in sd-webui v1.5.0
is_thumb_mode = false is_thumb_mode = false
if (extra_network_node) { if (extra_network_node) {
if (extra_network_node.className == "extra-network-thumbs") { if (extra_network_node.className == "extra-network-thumbs") {
@ -519,50 +521,57 @@ onUiLoaded(() => {
// replace preview text button // replace preview text button
replace_preview_btn = card.querySelector(".actions .additional a"); replace_preview_btn = card.querySelector(".actions .additional a");
if (replace_preview_btn==null) {
replace_preview_btn = document.createElement("a");
}
// check thumb mode // check thumb mode
if (is_thumb_mode) { if (is_thumb_mode) {
additional_node.style.display = null; additional_node.style.display = null;
if (!ul_node) {
// nothing to do.
continue;
}
if (ch_show_btn_on_thumb) { if (ch_show_btn_on_thumb) {
ul_node.style.background = btn_thumb_background; ul_node.style.background = btn_thumb_background;
} else { } else {
//reset
ul_node.style.background = null;
// console.log("remove existed buttons"); // console.log("remove existed buttons");
// remove existed buttons // remove existed buttons
if (ul_node) { //reset
// find all .a child nodes ul_node.style.background = null;
let atags = ul_node.querySelectorAll("a"); // find all .a child nodes
let atags = ul_node.querySelectorAll("a");
for (let atag of atags) { for (let atag of atags) {
//reset display //reset display
atag.style.display = null;
//remove extension's button
if (ch_btn_txts.indexOf(atag.textContent)>=0) {
//need to remove
ul_node.removeChild(atag);
} else {
//do not remove, just reset
atag.textContent = replace_preview_text;
atag.style.display = null; atag.style.display = null;
//remove extension's button atag.style.fontSize = null;
if (ch_btn_txts.indexOf(atag.innerHTML)>=0) { atag.style.position = null;
//need to remove atag.style.backgroundImage = null;
ul_node.removeChild(atag);
} else {
//do not remove, just reset
atag.innerHTML = replace_preview_text;
atag.style.display = null;
atag.style.fontSize = null;
atag.style.position = null;
atag.style.backgroundImage = null;
}
} }
//also remove br tag in ul
let brtag = ul_node.querySelector("br");
if (brtag) {
ul_node.removeChild(brtag);
}
} }
//just reset and remove nodes, do nothing else
continue; //also remove br tag in ul
let brtag = ul_node.querySelector("br");
if (brtag) {
ul_node.removeChild(brtag);
}
} }
//just reset and remove nodes, do nothing else
continue;
} else { } else {
// full preview mode // full preview mode
if (ch_always_display) { if (ch_always_display) {
@ -571,19 +580,25 @@ onUiLoaded(() => {
additional_node.style.display = null; additional_node.style.display = null;
} }
// remove br tag
let brtag = ul_node.querySelector("br"); if (!ul_node) {
if (brtag) { ul_node = document.createElement("ul");
ul_node.removeChild(brtag); } else {
// remove br tag
let brtag = ul_node.querySelector("br");
if (brtag) {
ul_node.removeChild(brtag);
}
} }
} }
// change replace preview text button into icon // change replace preview text button into icon
if (replace_preview_btn) { if (replace_preview_btn) {
if (replace_preview_btn.innerHTML !== "🖼️") { if (replace_preview_btn.textContent !== "🖼️") {
ul_node.appendChild(replace_preview_btn);
need_to_add_buttons = true; need_to_add_buttons = true;
replace_preview_btn.innerHTML = "🖼️"; replace_preview_btn.textContent = "🖼️";
if (!is_thumb_mode) { if (!is_thumb_mode) {
replace_preview_btn.style.fontSize = btn_fontSize; replace_preview_btn.style.fontSize = btn_fontSize;
replace_preview_btn.style.margin = btn_margin; replace_preview_btn.style.margin = btn_margin;
@ -601,7 +616,6 @@ onUiLoaded(() => {
continue; continue;
} }
// search_term node // search_term node
// search_term = subfolder path + model name + ext // search_term = subfolder path + model name + ext
search_term_node = card.querySelector(".actions .additional .search_term"); search_term_node = card.querySelector(".actions .additional .search_term");
@ -611,7 +625,7 @@ onUiLoaded(() => {
} }
// get search_term // get search_term
search_term = search_term_node.innerHTML; search_term = search_term_node.textContent;
if (!search_term) { if (!search_term) {
console.log("search_term is empty for cards in " + extra_network_id); console.log("search_term is empty for cards in " + extra_network_id);
continue; continue;
@ -626,7 +640,7 @@ onUiLoaded(() => {
// then we need to add 3 buttons to each ul node: // then we need to add 3 buttons to each ul node:
let open_url_node = document.createElement("a"); let open_url_node = document.createElement("a");
open_url_node.href = "#"; open_url_node.href = "#";
open_url_node.innerHTML = "🌐"; open_url_node.textContent = "🌐";
if (!is_thumb_mode) { if (!is_thumb_mode) {
open_url_node.style.fontSize = btn_fontSize; open_url_node.style.fontSize = btn_fontSize;
open_url_node.style.margin = btn_margin; open_url_node.style.margin = btn_margin;
@ -641,7 +655,7 @@ onUiLoaded(() => {
let add_trigger_words_node = document.createElement("a"); let add_trigger_words_node = document.createElement("a");
add_trigger_words_node.href = "#"; add_trigger_words_node.href = "#";
add_trigger_words_node.innerHTML = "💡"; add_trigger_words_node.textContent = "💡";
if (!is_thumb_mode) { if (!is_thumb_mode) {
add_trigger_words_node.style.fontSize = btn_fontSize; add_trigger_words_node.style.fontSize = btn_fontSize;
add_trigger_words_node.style.margin = btn_margin; add_trigger_words_node.style.margin = btn_margin;
@ -657,7 +671,7 @@ onUiLoaded(() => {
let use_preview_prompt_node = document.createElement("a"); let use_preview_prompt_node = document.createElement("a");
use_preview_prompt_node.href = "#"; use_preview_prompt_node.href = "#";
use_preview_prompt_node.innerHTML = "🏷️"; use_preview_prompt_node.textContent = "🏷️";
if (!is_thumb_mode) { if (!is_thumb_mode) {
use_preview_prompt_node.style.fontSize = btn_fontSize; use_preview_prompt_node.style.fontSize = btn_fontSize;
use_preview_prompt_node.style.margin = btn_margin; use_preview_prompt_node.style.margin = btn_margin;
@ -679,8 +693,9 @@ onUiLoaded(() => {
ul_node.appendChild(add_trigger_words_node); ul_node.appendChild(add_trigger_words_node);
ul_node.appendChild(use_preview_prompt_node); ul_node.appendChild(use_preview_prompt_node);
if (!ul_node.parentElement) {
additional_node.appendChild(ul_node);
}
} }
@ -713,7 +728,7 @@ onUiLoaded(() => {
// add refresh button to toolbar // add refresh button to toolbar
let ch_refresh = document.createElement("button"); let ch_refresh = document.createElement("button");
ch_refresh.innerHTML = "🔁"; ch_refresh.textContent = "🔁";
ch_refresh.title = "Refresh Civitai Helper's additional buttons"; ch_refresh.title = "Refresh Civitai Helper's additional buttons";
ch_refresh.className = "lg secondary gradio-button"; ch_refresh.className = "lg secondary gradio-button";
ch_refresh.style.fontSize = "200%"; ch_refresh.style.fontSize = "200%";

7
scripts/ch_lib/model.py
View File

@ -43,8 +43,11 @@ def get_custom_model_folder():
if shared.cmd_opts.lora_dir and os.path.isdir(shared.cmd_opts.lora_dir): if shared.cmd_opts.lora_dir and os.path.isdir(shared.cmd_opts.lora_dir):
folders["lora"] = shared.cmd_opts.lora_dir folders["lora"] = shared.cmd_opts.lora_dir
if shared.cmd_opts.lyco_dir and os.path.isdir(shared.cmd_opts.lyco_dir): try:
folders["lycoris"] = shared.cmd_opts.lyco_dir if shared.cmd_opts.lyco_dir and os.path.isdir(shared.cmd_opts.lyco_dir):
folders["lycoris"] = shared.cmd_opts.lyco_dir
except:
pass # XXX sd-webui v1.5.0 handles the lyco directory differently.
# write model info to file # write model info to file