Commit 5b1394be authored by yfszzx's avatar yfszzx

speed up images history perfect

parents a4de699e c57919ea
...@@ -43,7 +43,6 @@ function images_history_get_parent_by_tagname(item, tagname){ ...@@ -43,7 +43,6 @@ function images_history_get_parent_by_tagname(item, tagname){
var parent = item.parentElement; var parent = item.parentElement;
tagname = tagname.toUpperCase() tagname = tagname.toUpperCase()
while(parent.tagName != tagname){ while(parent.tagName != tagname){
console.log(parent.tagName, tagname)
parent = parent.parentElement; parent = parent.parentElement;
} }
return parent; return parent;
...@@ -108,7 +107,6 @@ function images_history_delete(del_num, tabname, image_index){ ...@@ -108,7 +107,6 @@ function images_history_delete(del_num, tabname, image_index){
}); });
var img_num = buttons.length / 2; var img_num = buttons.length / 2;
del_num = Math.min(img_num - image_index, del_num) del_num = Math.min(img_num - image_index, del_num)
console.log(del_num, img_num)
if (img_num <= del_num){ if (img_num <= del_num){
setTimeout(function(tabname){ setTimeout(function(tabname){
gradioApp().getElementById(tabname + '_images_history_renew_page').click(); gradioApp().getElementById(tabname + '_images_history_renew_page').click();
...@@ -133,7 +131,6 @@ function images_history_delete(del_num, tabname, image_index){ ...@@ -133,7 +131,6 @@ function images_history_delete(del_num, tabname, image_index){
} }
function images_history_turnpage(tabname){ function images_history_turnpage(tabname){
console.log("del_button")
gradioApp().getElementById(tabname + '_images_history_del_button').setAttribute('disabled','disabled'); gradioApp().getElementById(tabname + '_images_history_del_button').setAttribute('disabled','disabled');
var buttons = gradioApp().getElementById(tabname + '_images_history').querySelectorAll(".gallery-item"); var buttons = gradioApp().getElementById(tabname + '_images_history').querySelectorAll(".gallery-item");
buttons.forEach(function(elem) { buttons.forEach(function(elem) {
...@@ -148,8 +145,9 @@ function images_history_enable_del_buttons(){ ...@@ -148,8 +145,9 @@ function images_history_enable_del_buttons(){
} }
function images_history_init(){ function images_history_init(){
var load_txt2img_button = gradioApp().getElementById('saved_images_history_start') var loaded = gradioApp().getElementById("images_history_reconstruct_directory")
if (load_txt2img_button){ if (loaded){
var init_status = loaded.querySelector("input").checked
for (var i in images_history_tab_list ){ for (var i in images_history_tab_list ){
tab = images_history_tab_list[i]; tab = images_history_tab_list[i];
gradioApp().getElementById(tab + '_images_history').classList.add("images_history_cantainor"); gradioApp().getElementById(tab + '_images_history').classList.add("images_history_cantainor");
...@@ -161,25 +159,23 @@ function images_history_init(){ ...@@ -161,25 +159,23 @@ function images_history_init(){
var tabs_box = gradioApp().getElementById("tab_images_history").querySelector("div").querySelector("div").querySelector("div"); var tabs_box = gradioApp().getElementById("tab_images_history").querySelector("div").querySelector("div").querySelector("div");
tabs_box.setAttribute("id", "images_history_tab"); tabs_box.setAttribute("id", "images_history_tab");
var tab_btns = tabs_box.querySelectorAll("button"); var tab_btns = tabs_box.querySelectorAll("button");
for (var i in images_history_tab_list){ for (var i in images_history_tab_list){
var tabname = images_history_tab_list[i] var tabname = images_history_tab_list[i]
tab_btns[i].setAttribute("tabname", tabname); tab_btns[i].setAttribute("tabname", tabname);
if (init_status){
// this refreshes history upon tab switch
// until the history is known to work well, which is not the case now, we do not do this at startup
// -- load page very fast now, so better user experience by automatically activating pages
tab_btns[i].addEventListener('click', images_history_click_tab); tab_btns[i].addEventListener('click', images_history_click_tab);
} }
tabs_box.classList.add(images_history_tab_list[0]); }
if (init_status){
// same as above, at page load-- load very fast now tab_btns[0].click();
load_txt2img_button.click(); }
} else { } else {
setTimeout(images_history_init, 500); setTimeout(images_history_init, 500);
} }
} }
var images_history_tab_list = ["saved", "txt2img", "img2img", "extras"]; var images_history_tab_list = ["txt2img", "img2img", "extras", "saved"];
setTimeout(images_history_init, 500); setTimeout(images_history_init, 500);
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
var mutationObserver = new MutationObserver(function(m){ var mutationObserver = new MutationObserver(function(m){
......
...@@ -73,8 +73,10 @@ function check_gallery(id_gallery){ ...@@ -73,8 +73,10 @@ function check_gallery(id_gallery){
let galleryBtnSelected = gradioApp().querySelector('#'+id_gallery+' .gallery-item.\\!ring-2') let galleryBtnSelected = gradioApp().querySelector('#'+id_gallery+' .gallery-item.\\!ring-2')
if (prevSelectedIndex !== -1 && galleryButtons.length>prevSelectedIndex && !galleryBtnSelected) { if (prevSelectedIndex !== -1 && galleryButtons.length>prevSelectedIndex && !galleryBtnSelected) {
//automatically re-open previously selected index (if exists) //automatically re-open previously selected index (if exists)
activeElement = document.activeElement;
galleryButtons[prevSelectedIndex].click(); galleryButtons[prevSelectedIndex].click();
showGalleryImage(); showGalleryImage();
if(activeElement) activeElement.focus()
} }
}) })
galleryObservers[id_gallery].observe( gallery, { childList:true, subtree:false }) galleryObservers[id_gallery].observe( gallery, { childList:true, subtree:false })
......
This diff is collapsed.
...@@ -334,12 +334,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed: ...@@ -334,12 +334,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
seed = get_fixed_seed(p.seed) seed = get_fixed_seed(p.seed)
subseed = get_fixed_seed(p.subseed) subseed = get_fixed_seed(p.subseed)
if p.outpath_samples is not None:
os.makedirs(p.outpath_samples, exist_ok=True)
if p.outpath_grids is not None:
os.makedirs(p.outpath_grids, exist_ok=True)
modules.sd_hijack.model_hijack.apply_circular(p.tiling) modules.sd_hijack.model_hijack.apply_circular(p.tiling)
modules.sd_hijack.model_hijack.clear_comments() modules.sd_hijack.model_hijack.clear_comments()
......
...@@ -299,6 +299,12 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters" ...@@ -299,6 +299,12 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters"
'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}), 'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}),
})) }))
options_templates.update(options_section(('images-history', "Images history"), {
"images_history_reconstruct_directory": OptionInfo(False, "Reconstruct output directory structure.This can greatly improve the speed of loading , but will change the original output directory structure"),
"images_history_num_per_page": OptionInfo(36, "Number of pictures displayed on each page"),
"images_history_pages_num": OptionInfo(6, "Maximum number of pages per load "),
}))
class Options: class Options:
data = None data = None
......
...@@ -1394,7 +1394,10 @@ def create_ui(wrap_gradio_gpu_call): ...@@ -1394,7 +1394,10 @@ def create_ui(wrap_gradio_gpu_call):
component_dict = {} component_dict = {}
def open_folder(f): def open_folder(f):
if not os.path.isdir(f): if not os.path.exists(f):
print(f'Folder "{f}" does not exist. After you create an image, the folder will be created.')
return
elif not os.path.isdir(f):
print(f""" print(f"""
WARNING WARNING
An open_folder request was made with an argument that is not a folder. An open_folder request was made with an argument that is not a folder.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment