renames tabname to tab_base_tag, introduced before
simplifies a lot of manual loops into foreach or maps and filters changes vars to mostly const, some lets remainpull/51/head
parent
7351746b4e
commit
3e1744ad06
|
|
@ -1,32 +1,26 @@
|
|||
var image_browser_click_image = function(){
|
||||
if (!this.classList?.contains("transform")){
|
||||
var gallery = image_browser_get_parent_by_class(this, "image_browser_container");
|
||||
var buttons = gallery.querySelectorAll(".gallery-item");
|
||||
var i = 0;
|
||||
var hidden_list = [];
|
||||
buttons.forEach(function(e){
|
||||
if (e.style.display == "none"){
|
||||
hidden_list.push(i);
|
||||
}
|
||||
i += 1;
|
||||
})
|
||||
if (hidden_list.length > 0){
|
||||
setTimeout(image_browser_hide_buttons, 10, hidden_list, gallery);
|
||||
}
|
||||
}
|
||||
image_browser_set_image_info(this);
|
||||
const image_browser_click_image = function() {
|
||||
if (!this.classList?.contains("transform")) {
|
||||
const gallery = image_browser_get_parent_by_class(this, "image_browser_container");
|
||||
const gallery_items = Array.from(gallery.querySelectorAll(".gallery-item"));
|
||||
// List of gallery item indices that are currently hidden in the image browser.
|
||||
const hidden_indices_list = gallery_items.filter(elem => elem.style.display === 'none').map(elem => gallery_items.indexOf(elem));
|
||||
if (hidden_indices_list.length > 0) {
|
||||
setTimeout(image_browser_hide_gallery_items, 10, hidden_indices_list, gallery);
|
||||
}
|
||||
}
|
||||
image_browser_set_image_info(this);
|
||||
}
|
||||
|
||||
function image_browser_get_parent_by_class(item, class_name){
|
||||
var parent = item.parentElement;
|
||||
function image_browser_get_parent_by_class(item, class_name) {
|
||||
let parent = item.parentElement;
|
||||
while(!parent.classList.contains(class_name)){
|
||||
parent = parent.parentElement;
|
||||
}
|
||||
return parent;
|
||||
}
|
||||
|
||||
function image_browser_get_parent_by_tagname(item, tagname){
|
||||
var parent = item.parentElement;
|
||||
function image_browser_get_parent_by_tagname(item, tagname) {
|
||||
let parent = item.parentElement;
|
||||
tagname = tagname.toUpperCase()
|
||||
while(parent.tagName != tagname){
|
||||
parent = parent.parentElement;
|
||||
|
|
@ -34,148 +28,121 @@ function image_browser_get_parent_by_tagname(item, tagname){
|
|||
return parent;
|
||||
}
|
||||
|
||||
function image_browser_hide_buttons(hidden_list, gallery){
|
||||
var buttons = gallery.querySelectorAll(".gallery-item");
|
||||
var num = 0;
|
||||
buttons.forEach(function(e){
|
||||
if (e.style.display == "none"){
|
||||
num += 1;
|
||||
}
|
||||
});
|
||||
if (num == hidden_list.length){
|
||||
setTimeout(image_browser_hide_buttons, 10, hidden_list, gallery);
|
||||
}
|
||||
for( i in hidden_list){
|
||||
buttons[hidden_list[i]].style.display = "none";
|
||||
}
|
||||
function image_browser_hide_gallery_items(hidden_indices_list, gallery) {
|
||||
const gallery_items = gallery.querySelectorAll(".gallery-item");
|
||||
// The number of gallery items that are currently hidden in the image browser.
|
||||
const num = Array.from(gallery_items).filter(elem => elem.style.display === 'none').length;
|
||||
if (num == hidden_indices_list.length) {
|
||||
setTimeout(image_browser_hide_gallery_items, 10, hidden_indices_list, gallery);
|
||||
}
|
||||
hidden_indices_list.forEach(i => gallery_items[i].style.display = 'none');
|
||||
}
|
||||
|
||||
function image_browser_set_image_info(button){
|
||||
var buttons = image_browser_get_parent_by_tagname(button, "DIV").querySelectorAll(".gallery-item");
|
||||
var index = -1;
|
||||
var i = 0;
|
||||
buttons.forEach(function(e){
|
||||
if(e == button){
|
||||
index = i;
|
||||
}
|
||||
if(e.style.display != "none"){
|
||||
i += 1;
|
||||
}
|
||||
});
|
||||
var gallery = image_browser_get_parent_by_class(button, "image_browser_container");
|
||||
var set_btn = gallery.querySelector(".image_browser_set_index");
|
||||
var curr_idx = set_btn.getAttribute("img_index", index);
|
||||
function image_browser_set_image_info(gallery_item) {
|
||||
const gallery_items = image_browser_get_parent_by_tagname(gallery_item, "DIV").querySelectorAll(".gallery-item");
|
||||
// Finds the index of the specified gallery item within the visible gallery items in the image browser.
|
||||
const index = Array.from(gallery_items).filter(elem => elem.style.display !== 'none').indexOf(gallery_item);
|
||||
const gallery = image_browser_get_parent_by_class(gallery_item, "image_browser_container");
|
||||
const set_btn = gallery.querySelector(".image_browser_set_index");
|
||||
const curr_idx = set_btn.getAttribute("img_index", index);
|
||||
if (curr_idx != index) {
|
||||
set_btn.setAttribute("img_index", index);
|
||||
set_btn.setAttribute("img_index", index);
|
||||
}
|
||||
set_btn.click();
|
||||
|
||||
}
|
||||
|
||||
function image_browser_get_current_img(tabname, img_index, page_index, filenames, turn_page_switch){
|
||||
function image_browser_get_current_img(tab_base_tag, img_index, page_index, filenames, turn_page_switch) {
|
||||
return [
|
||||
tabname,
|
||||
gradioApp().getElementById(tabname + '_image_browser_set_index').getAttribute("img_index"),
|
||||
tab_base_tag,
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_set_index').getAttribute("img_index"),
|
||||
page_index,
|
||||
filenames,
|
||||
turn_page_switch
|
||||
];
|
||||
}
|
||||
|
||||
function image_browser_delete(del_num, tabname, image_index){
|
||||
function image_browser_delete(del_num, tab_base_tag, image_index) {
|
||||
image_index = parseInt(image_index);
|
||||
var tab = gradioApp().getElementById(tabname + '_image_browser');
|
||||
var set_btn = tab.querySelector(".image_browser_set_index");
|
||||
var buttons = [];
|
||||
tab.querySelectorAll(".gallery-item").forEach(function(e){
|
||||
if (e.style.display != 'none'){
|
||||
buttons.push(e);
|
||||
}
|
||||
});
|
||||
var img_num = buttons.length / 2;
|
||||
del_num = Math.min(img_num - image_index, del_num)
|
||||
if (img_num <= del_num){
|
||||
setTimeout(function(tabname){
|
||||
gradioApp().getElementById(tabname + '_image_browser_renew_page').click();
|
||||
}, 30, tabname);
|
||||
const tab = gradioApp().getElementById(tab_base_tag + '_image_browser');
|
||||
const set_btn = tab.querySelector(".image_browser_set_index");
|
||||
const gallery_items = Array.from(tab.querySelectorAll('.gallery-item')).filter(item => item.style.display !== 'none');
|
||||
const img_num = gallery_items.length / 2;
|
||||
del_num = Math.min(img_num - image_index, del_num)
|
||||
if (img_num <= del_num) {
|
||||
// If all images are deleted, we reload the browser page.
|
||||
setTimeout(function(tab_base_tag) {
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_renew_page').click();
|
||||
}, 30, tab_base_tag);
|
||||
} else {
|
||||
var next_img
|
||||
for (var i = 0; i < del_num; i++){
|
||||
buttons[image_index + i].style.display = 'none';
|
||||
buttons[image_index + i + img_num].style.display = 'none';
|
||||
next_img = image_index + i + 1
|
||||
// After deletion of the image, we have to navigate to the next image (or wraparound).
|
||||
for (let i = 0; i < del_num; i++) {
|
||||
gallery_items[image_index + i].style.display = 'none';
|
||||
gallery_items[image_index + i + img_num].style.display = 'none';
|
||||
}
|
||||
var btn;
|
||||
if (next_img >= img_num){
|
||||
btn = buttons[image_index - 1];
|
||||
} else {
|
||||
btn = buttons[next_img];
|
||||
}
|
||||
const next_img = gallery_items.find((elem, i) => elem.style.display !== 'none' && i > image_index);
|
||||
const btn = next_img || gallery_items[image_index - 1];
|
||||
setTimeout(function(btn){btn.click()}, 30, btn);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function image_browser_turnpage(tabname){
|
||||
var buttons = gradioApp().getElementById(tabname + '_image_browser').querySelectorAll(".gallery-item");
|
||||
buttons.forEach(function(elem) {
|
||||
function image_browser_turnpage(tab_base_tag) {
|
||||
const gallery_items = gradioApp().getElementById(tab_base_tag + '_image_browser').querySelectorAll(".gallery-item");
|
||||
gallery_items.forEach(function(elem) {
|
||||
elem.style.display = 'block';
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function image_browser_init(){
|
||||
var tabnames = gradioApp().getElementById("image_browser_tabnames_list")
|
||||
if (tabnames){
|
||||
image_browser_tab_list = tabnames.querySelector("textarea").value.split(",")
|
||||
for (var i in image_browser_tab_list ){
|
||||
var tab = image_browser_tab_list[i];
|
||||
gradioApp().getElementById(tab + '_image_browser').classList.add("image_browser_container");
|
||||
gradioApp().getElementById(tab + '_image_browser_set_index').classList.add("image_browser_set_index");
|
||||
gradioApp().getElementById(tab + '_image_browser_del_img_btn').classList.add("image_browser_del_img_btn");
|
||||
gradioApp().getElementById(tab + '_image_browser_gallery').classList.add("image_browser_gallery");
|
||||
}
|
||||
function image_browser_init() {
|
||||
const tab_base_tags = gradioApp().getElementById("image_browser_tab_base_tags_list");
|
||||
if (tab_base_tags) {
|
||||
image_browser_tab_base_tags_list = tab_base_tags.querySelector("textarea").value.split(",");
|
||||
image_browser_tab_base_tags_list.forEach(function(tab_base_tag) {
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser').classList.add("image_browser_container");
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_set_index').classList.add("image_browser_set_index");
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_del_img_btn').classList.add("image_browser_del_img_btn");
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_gallery').classList.add("image_browser_gallery");
|
||||
});
|
||||
|
||||
//preload
|
||||
var tab_btns = gradioApp().getElementById("image_browser_tabs_container").querySelector("div").querySelectorAll("button");
|
||||
for (var i in image_browser_tab_list){
|
||||
var tabname = image_browser_tab_list[i]
|
||||
tab_btns[i].setAttribute("tabname", tabname);
|
||||
tab_btns[i].addEventListener('click', function(){
|
||||
var tabs_box = gradioApp().getElementById("image_browser_tabs_container");
|
||||
if (!tabs_box.classList.contains(this.getAttribute("tabname"))) {
|
||||
gradioApp().getElementById(this.getAttribute("tabname") + "_image_browser_renew_page").click();
|
||||
tabs_box.classList.add(this.getAttribute("tabname"))
|
||||
}
|
||||
const tab_btns = gradioApp().getElementById("image_browser_tabs_container").querySelector("div").querySelectorAll("button");
|
||||
tab_btns.forEach(function(btn, i) {
|
||||
const tab_base_tag = image_browser_tab_base_tags_list[i];
|
||||
btn.setAttribute("tab_base_tag", tab_base_tag);
|
||||
btn.addEventListener('click', function() {
|
||||
const tabs_box = gradioApp().getElementById("image_browser_tabs_container");
|
||||
if (!tabs_box.classList.contains(this.getAttribute("tab_base_tag"))) {
|
||||
gradioApp().getElementById(this.getAttribute("tab_base_tag") + "_image_browser_renew_page").click();
|
||||
tabs_box.classList.add(this.getAttribute("tab_base_tag"));
|
||||
}
|
||||
});
|
||||
}
|
||||
if (gradioApp().getElementById("image_browser_preload").querySelector("input").checked ){
|
||||
});
|
||||
if (gradioApp().getElementById("image_browser_preload").querySelector("input").checked) {
|
||||
setTimeout(function(){tab_btns[0].click()}, 100);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
setTimeout(image_browser_init, 500);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let timer
|
||||
var image_browser_tab_list = "";
|
||||
let timer;
|
||||
let image_browser_tab_base_tags_list = "";
|
||||
setTimeout(image_browser_init, 500);
|
||||
document.addEventListener("DOMContentLoaded", function() {
|
||||
var mutationObserver = new MutationObserver(function(m){
|
||||
if (image_browser_tab_list != ""){
|
||||
|
||||
for (var i in image_browser_tab_list ){
|
||||
let tabname = image_browser_tab_list[i]
|
||||
var buttons = gradioApp().querySelectorAll('#' + tabname + '_image_browser .gallery-item');
|
||||
buttons.forEach(function(button){
|
||||
button.addEventListener('click', image_browser_click_image, true);
|
||||
const mutationObserver = new MutationObserver(function(m) {
|
||||
if (image_browser_tab_base_tags_list != "") {
|
||||
image_browser_tab_base_tags_list.forEach(function(tab_base_tag) {
|
||||
const tab_gallery_items = gradioApp().querySelectorAll('#' + tab_base_tag + '_image_browser .gallery-item');
|
||||
tab_gallery_items.forEach(function(gallery_item) {
|
||||
gallery_item.addEventListener('click', image_browser_click_image, true);
|
||||
document.onkeyup = function(e) {
|
||||
if (!image_browser_active()) {
|
||||
return;
|
||||
}
|
||||
clearTimeout(timer)
|
||||
timer = setTimeout(() => {
|
||||
var gallery_btn = gradioApp().getElementById(image_browser_current_tab() + "_image_browser_gallery").getElementsByClassName('gallery-item !flex-none !h-9 !w-9 transition-all duration-75 !ring-2 !ring-orange-500 hover:!ring-orange-500 svelte-1g9btlg');
|
||||
let gallery_btn = gradioApp().getElementById(image_browser_current_tab() + "_image_browser_gallery").getElementsByClassName('gallery-item !flex-none !h-9 !w-9 transition-all duration-75 !ring-2 !ring-orange-500 hover:!ring-orange-500 svelte-1g9btlg');
|
||||
gallery_btn = gallery_btn && gallery_btn.length > 0 ? gallery_btn[0] : null;
|
||||
if (gallery_btn) {
|
||||
image_browser_click_image.call(gallery_btn)
|
||||
|
|
@ -184,34 +151,33 @@ document.addEventListener("DOMContentLoaded", function() {
|
|||
}
|
||||
});
|
||||
|
||||
var cls_btn = gradioApp().getElementById(tabname + '_image_browser_gallery').querySelector("svg");
|
||||
if (cls_btn){
|
||||
cls_btn.addEventListener('click', function(){
|
||||
gradioApp().getElementById(tabname + '_image_browser_renew_page').click();
|
||||
const cls_btn = gradioApp().getElementById(tab_base_tag + '_image_browser_gallery').querySelector("svg");
|
||||
if (cls_btn) {
|
||||
cls_btn.addEventListener('click', function() {
|
||||
gradioApp().getElementById(tab_base_tag + '_image_browser_renew_page').click();
|
||||
}, false);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
mutationObserver.observe(gradioApp(), { childList:true, subtree:true });
|
||||
});
|
||||
|
||||
function image_browser_current_tab() {
|
||||
let tabs = gradioApp().getElementById("image_browser_tabs_container").querySelectorAll('[id$="_image_browser_container"]');
|
||||
const tabs = gradioApp().getElementById("image_browser_tabs_container").querySelectorAll('[id$="_image_browser_container"]');
|
||||
|
||||
for (const element of tabs) {
|
||||
if (element.style.display === "block") {
|
||||
const id = element.id;
|
||||
const index = id.indexOf("_image_browser_container");
|
||||
const tabname = id.substring(0, index);
|
||||
return tabname;
|
||||
const tab_base_tag = id.substring(0, index);
|
||||
return tab_base_tag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function image_browser_active() {
|
||||
let ext_active = gradioApp().getElementById("tab_image_browser");
|
||||
const ext_active = gradioApp().getElementById("tab_image_browser");
|
||||
return ext_active && ext_active.style.display !== "none";
|
||||
}
|
||||
|
||||
|
|
@ -232,12 +198,12 @@ gradioApp().addEventListener("keydown", function(event) {
|
|||
return;
|
||||
}
|
||||
|
||||
let tabname = image_browser_current_tab();
|
||||
const tab_base_tag = image_browser_current_tab();
|
||||
|
||||
// Listens for keypresses 0-5 and updates the corresponding ranking (0 is the last option, None)
|
||||
if (event.code >= "Digit0" && event.code <= "Digit5") {
|
||||
let selectedValue = event.code.charAt(event.code.length - 1);
|
||||
let radioInputs = gradioApp().getElementById(tabname + "_image_browser_ranking").getElementsByTagName("input");
|
||||
const selectedValue = event.code.charAt(event.code.length - 1);
|
||||
const radioInputs = gradioApp().getElementById(tab_base_tag + "_image_browser_ranking").getElementsByTagName("input");
|
||||
for (const input of radioInputs) {
|
||||
if (input.value === selectedValue || (selectedValue === '0' && input === radioInputs[radioInputs.length - 1])) {
|
||||
input.checked = true;
|
||||
|
|
@ -247,7 +213,7 @@ gradioApp().addEventListener("keydown", function(event) {
|
|||
}
|
||||
}
|
||||
|
||||
let mod_keys = gradioApp().querySelector(`#${tabname}_image_browser_mod_keys textarea`).value;
|
||||
const mod_keys = gradioApp().querySelector(`#${tab_base_tag}_image_browser_mod_keys textarea`).value;
|
||||
let modifiers_pressed = false;
|
||||
if (mod_keys.indexOf("C") !== -1 && mod_keys.indexOf("S") !== -1) {
|
||||
if (event.ctrlKey && event.shiftKey) {
|
||||
|
|
@ -264,39 +230,39 @@ gradioApp().addEventListener("keydown", function(event) {
|
|||
}
|
||||
|
||||
if (event.code == "KeyF") {
|
||||
if (tabname == "Favorites") {
|
||||
if (tab_base_tag == "Favorites") {
|
||||
return;
|
||||
}
|
||||
let favoriteBtn = gradioApp().getElementById(tabname + "_image_browser_favorites_btn");
|
||||
const favoriteBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_favorites_btn");
|
||||
favoriteBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
|
||||
if (event.code == "KeyR") {
|
||||
let refreshBtn = gradioApp().getElementById(tabname + "_image_browser_renew_page");
|
||||
const refreshBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_renew_page");
|
||||
refreshBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
|
||||
if (event.code == "Delete") {
|
||||
let deleteBtn = gradioApp().getElementById(tabname + "_image_browser_del_img_btn");
|
||||
const deleteBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_del_img_btn");
|
||||
deleteBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
|
||||
// prevent left arrow following delete, instead refresh page
|
||||
if (event.code == "ArrowLeft" && !event.altKey && !event.ctrlKey && !event.shiftKey && !event.metaKey) {
|
||||
let deleteState = gradioApp().getElementById(tabname + "_image_browser_delete_state").getElementsByClassName('gr-check-radio gr-checkbox')[0];
|
||||
const deleteState = gradioApp().getElementById(tab_base_tag + "_image_browser_delete_state").getElementsByClassName('gr-check-radio gr-checkbox')[0];
|
||||
if (deleteState.checked) {
|
||||
let refreshBtn = gradioApp().getElementById(tabname + "_image_browser_renew_page");
|
||||
const refreshBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_renew_page");
|
||||
refreshBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
}
|
||||
|
||||
if (event.code == "ArrowLeft" && modifiers_pressed) {
|
||||
let prevBtn = gradioApp().getElementById(tabname + "_image_browser_prev_page");
|
||||
const prevBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_prev_page");
|
||||
prevBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
|
||||
|
||||
if (event.code == "ArrowRight" && modifiers_pressed) {
|
||||
let nextBtn = gradioApp().getElementById(tabname + "_image_browser_next_page");
|
||||
const nextBtn = gradioApp().getElementById(tab_base_tag + "_image_browser_next_page");
|
||||
nextBtn.dispatchEvent(new Event("click"));
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@ def delete_image(delete_num, name, filenames, image_index, visible_num):
|
|||
i += 1
|
||||
return new_file_list, 1, visible_num, delete_state
|
||||
|
||||
def traverse_all_files(curr_path, image_list, tabname_box, img_path_depth) -> List[Tuple[str, os.stat_result, str, int]]:
|
||||
def traverse_all_files(curr_path, image_list, tab_base_tag_box, img_path_depth) -> List[Tuple[str, os.stat_result, str, int]]:
|
||||
global current_depth
|
||||
if curr_path == "":
|
||||
return image_list
|
||||
|
|
@ -286,9 +286,9 @@ def traverse_all_files(curr_path, image_list, tabname_box, img_path_depth) -> Li
|
|||
if os.path.splitext(fname)[1] in image_ext_list:
|
||||
image_list.append(f_info)
|
||||
elif stat.S_ISDIR(fstat.st_mode):
|
||||
if (opts.image_browser_with_subdirs and tabname_box != "Others") or (tabname_box == "Others" and img_path_depth != 0 and (current_depth < img_path_depth or img_path_depth < 0)):
|
||||
if (opts.image_browser_with_subdirs and tab_base_tag_box != "Others") or (tab_base_tag_box == "Others" and img_path_depth != 0 and (current_depth < img_path_depth or img_path_depth < 0)):
|
||||
current_depth = current_depth + 1
|
||||
image_list = traverse_all_files(fname, image_list, tabname_box, img_path_depth)
|
||||
image_list = traverse_all_files(fname, image_list, tab_base_tag_box, img_path_depth)
|
||||
current_depth = current_depth - 1
|
||||
return image_list
|
||||
|
||||
|
|
@ -431,10 +431,10 @@ def natural_keys(text):
|
|||
return [ atof(c) for c in re.split(r'[+-]?([0-9]+(?:[.][0-9]*)?|[.][0-9]+)', text) ]
|
||||
|
||||
|
||||
def get_all_images(dir_name, sort_by, sort_order, keyword, tabname_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search):
|
||||
def get_all_images(dir_name, sort_by, sort_order, keyword, tab_base_tag_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search):
|
||||
global current_depth
|
||||
current_depth = 0
|
||||
fileinfos = traverse_all_files(dir_name, [], tabname_box, img_path_depth)
|
||||
fileinfos = traverse_all_files(dir_name, [], tab_base_tag_box, img_path_depth)
|
||||
keyword = keyword.strip(" ")
|
||||
|
||||
if opts.image_browser_scan_exif:
|
||||
|
|
@ -523,13 +523,13 @@ def get_all_images(dir_name, sort_by, sort_order, keyword, tabname_box, img_path
|
|||
filenames = [finfo for finfo in fileinfos]
|
||||
return filenames
|
||||
|
||||
def get_image_page(img_path, page_index, filenames, keyword, sort_by, sort_order, tabname_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search, delete_state):
|
||||
def get_image_page(img_path, page_index, filenames, keyword, sort_by, sort_order, tab_base_tag_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search, delete_state):
|
||||
if img_path == "":
|
||||
return [], page_index, [], "", "", "", 0, "", delete_state
|
||||
|
||||
img_path, _ = pure_path(img_path)
|
||||
if page_index == 1 or page_index == 0 or len(filenames) == 0:
|
||||
filenames = get_all_images(img_path, sort_by, sort_order, keyword, tabname_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search)
|
||||
filenames = get_all_images(img_path, sort_by, sort_order, keyword, tab_base_tag_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search)
|
||||
page_index = int(page_index)
|
||||
length = len(filenames)
|
||||
max_page_index = length // num_of_imgs_per_page + 1
|
||||
|
|
@ -549,12 +549,12 @@ def get_image_page(img_path, page_index, filenames, keyword, sort_by, sort_order
|
|||
delete_state = False
|
||||
return filenames, gr.update(value=page_index, label=f"Page Index ({page_index}/{max_page_index})"), image_list, "", "", "", visible_num, load_info, delete_state
|
||||
|
||||
def get_current_file(tabname_box, num, page_index, filenames):
|
||||
def get_current_file(tab_base_tag_box, num, page_index, filenames):
|
||||
file = filenames[int(num) + int((page_index - 1) * num_of_imgs_per_page)]
|
||||
return file
|
||||
|
||||
def show_image_info(tabname_box, num, page_index, filenames, turn_page_switch):
|
||||
logger.debug(f"tabname_box, num, page_index, len(filenames), num_of_imgs_per_page: {tabname_box}, {num}, {page_index}, {len(filenames)}, {num_of_imgs_per_page}")
|
||||
def show_image_info(tab_base_tag_box, num, page_index, filenames, turn_page_switch):
|
||||
logger.debug(f"tab_base_tag_box, num, page_index, len(filenames), num_of_imgs_per_page: {tab_base_tag_box}, {num}, {page_index}, {len(filenames)}, {num_of_imgs_per_page}")
|
||||
if len(filenames) == 0:
|
||||
# This should only happen if webui was stopped and started again and the user clicks on one of the still displayed images.
|
||||
# The state with the filenames will be empty then. In that case we return None to prevent further errors and force a page refresh.
|
||||
|
|
@ -566,7 +566,7 @@ def show_image_info(tabname_box, num, page_index, filenames, turn_page_switch):
|
|||
tm = "<div style='color:#999' align='right'>" + time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(os.path.getmtime(file))) + "</div>"
|
||||
return file, tm, num, file, turn_page_switch
|
||||
|
||||
def show_next_image_info(tabname_box, num, page_index, filenames, auto_next):
|
||||
def show_next_image_info(tab_base_tag_box, num, page_index, filenames, auto_next):
|
||||
file = filenames[int(num) + int((page_index - 1) * num_of_imgs_per_page)]
|
||||
tm = "<div style='color:#999' align='right'>" + time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(os.path.getmtime(file))) + "</div>"
|
||||
if auto_next:
|
||||
|
|
@ -731,7 +731,7 @@ def create_tab(tab: ImageBrowserTab, current_gr_tab: gr.Tab):
|
|||
with gr.Row(visible=False):
|
||||
renew_page = gr.Button("Renew Page", elem_id=f"{tab.base_tag}_image_browser_renew_page")
|
||||
visible_img_num = gr.Number()
|
||||
tab_tag_box = gr.Textbox(tab.base_tag)
|
||||
tab_base_tag_box = gr.Textbox(tab.base_tag)
|
||||
image_index = gr.Textbox(value=-1)
|
||||
set_index = gr.Button('set_index', elem_id=f"{tab.base_tag}_image_browser_set_index")
|
||||
filenames = gr.State([])
|
||||
|
|
@ -761,7 +761,7 @@ def create_tab(tab: ImageBrowserTab, current_gr_tab: gr.Tab):
|
|||
|
||||
#delete
|
||||
delete.click(delete_image, inputs=[delete_num, img_file_name, filenames, image_index, visible_img_num], outputs=[filenames, delete_num, visible_img_num, delete_state])
|
||||
delete.click(fn=None, _js="image_browser_delete", inputs=[delete_num, tab_tag_box, image_index], outputs=None)
|
||||
delete.click(fn=None, _js="image_browser_delete", inputs=[delete_num, tab_base_tag_box, image_index], outputs=None)
|
||||
if tab.name == favorite_tab_name:
|
||||
img_file_name.change(fn=update_move_text_one, inputs=[to_dir_btn], outputs=[to_dir_btn])
|
||||
else:
|
||||
|
|
@ -787,10 +787,10 @@ def create_tab(tab: ImageBrowserTab, current_gr_tab: gr.Tab):
|
|||
|
||||
turn_page_switch.change(
|
||||
fn=get_image_page,
|
||||
inputs=[img_path, page_index, filenames, keyword, sort_by, sort_order, tab_tag_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search, delete_state],
|
||||
inputs=[img_path, page_index, filenames, keyword, sort_by, sort_order, tab_base_tag_box, img_path_depth, ranking_filter, aes_filter, exif_keyword, negative_prompt_search, delete_state],
|
||||
outputs=[filenames, page_index, image_gallery, img_file_name, img_file_time, img_file_info, visible_img_num, warning_box, delete_state]
|
||||
)
|
||||
turn_page_switch.change(fn=None, inputs=[tab_tag_box], outputs=None, _js="image_browser_turnpage")
|
||||
turn_page_switch.change(fn=None, inputs=[tab_base_tag_box], outputs=None, _js="image_browser_turnpage")
|
||||
turn_page_switch.change(fn=lambda:(gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)), inputs=None, outputs=[delete_panel, button_panel, ranking, to_dir_panel])
|
||||
|
||||
sort_order.click(
|
||||
|
|
@ -827,7 +827,7 @@ def create_tab(tab: ImageBrowserTab, current_gr_tab: gr.Tab):
|
|||
)
|
||||
|
||||
# other functions
|
||||
set_index.click(show_image_info, _js="image_browser_get_current_img", inputs=[tab_tag_box, image_index, page_index, filenames, turn_page_switch], outputs=[img_file_name, img_file_time, image_index, hidden, turn_page_switch])
|
||||
set_index.click(show_image_info, _js="image_browser_get_current_img", inputs=[tab_base_tag_box, image_index, page_index, filenames, turn_page_switch], outputs=[img_file_name, img_file_time, image_index, hidden, turn_page_switch])
|
||||
set_index.click(fn=lambda:(gr.update(visible=True), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)), inputs=None, outputs=[delete_panel, button_panel, ranking, to_dir_panel])
|
||||
img_file_name.change(fn=lambda : "", inputs=None, outputs=[collected_warning])
|
||||
img_file_name.change(get_ranking, inputs=img_file_name, outputs=ranking)
|
||||
|
|
@ -837,7 +837,7 @@ def create_tab(tab: ImageBrowserTab, current_gr_tab: gr.Tab):
|
|||
|
||||
#ranking
|
||||
ranking.change(wib_db.update_ranking, inputs=[img_file_name, ranking])
|
||||
#ranking.change(show_next_image_info, _js="image_browser_get_current_img", inputs=[tabname_box, image_index, page_index, auto_next], outputs=[img_file_name, img_file_time, image_index, hidden])
|
||||
#ranking.change(show_next_image_info, _js="image_browser_get_current_img", inputs=[tab_base_tag_box, image_index, page_index, auto_next], outputs=[img_file_name, img_file_time, image_index, hidden])
|
||||
|
||||
try:
|
||||
modules.generation_parameters_copypaste.bind_buttons(send_to_buttons, hidden, img_file_info)
|
||||
|
|
@ -890,7 +890,7 @@ def on_ui_tabs():
|
|||
with gr.Blocks(analytics_enabled=False) :
|
||||
create_tab(tab, current_gr_tab)
|
||||
gr.Checkbox(opts.image_browser_preload, elem_id="image_browser_preload", visible=False)
|
||||
gr.Textbox(",".join( [tab.base_tag for tab in tabs_list] ), elem_id="image_browser_tabnames_list", visible=False)
|
||||
gr.Textbox(",".join( [tab.base_tag for tab in tabs_list] ), elem_id="image_browser_tab_base_tags_list", visible=False)
|
||||
return (image_browser , "Image Browser", "image_browser"),
|
||||
|
||||
def move_setting(options, section, added):
|
||||
|
|
|
|||
Loading…
Reference in New Issue