1580158
/
stable-diffusion-webui-images-browser
mirror of https://github.com/AlUlkesh/stable-diffusion-webui-images-browser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for Return to thumbnail view, #122, check Gradio version

pull/124/head
AlUlkesh 2023-04-03 15:52:07 +02:00
parent db40a6e925
commit 07940948ba
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
javascript/image_browser.js
View File

@ -1,5 +1,4 @@
let image_browser_state = "free"
let image_browser_oldGradio
let image_browser_galleryItemName
onUiLoaded(image_browser_start)
@ -24,16 +23,6 @@ async function image_browser_unlock() {
image_browser_state = "free"
}
function isVersionSmaller(version1, version2) {
let v1 = version1.split('.').map(Number)
let v2 = version2.split('.').map(Number)
for (let i = 0; i < Math.max(v1.length, v2.length); i++) {
if ((v1[i] || 0) < (v2[i] || 0)) return true
if ((v1[i] || 0) > (v2[i] || 0)) return false
}
return false
}
const image_browser_click_image = async function() {
await image_browser_lock("image_browser_click_image")
const gallery_items = image_browser_get_parent_by_tagname(this, "DIV").querySelectorAll(image_browser_image_browser_galleryItemNameDot)
@ -171,10 +160,33 @@ async function image_browser_select_image(tab_base_tag, img_index) {
async function image_browser_turnpage(tab_base_tag) {
await image_browser_lock("image_browser_turnpage")
const gallery_items = gradioApp().getElementById(tab_base_tag + '_image_browser').querySelectorAll(image_browser_image_browser_galleryItemNameDot)
gallery_items.forEach(function(elem) {
elem.style.display = 'block'
})
const gallery = gradioApp().getElementById(tab_base_tag + "_image_browser_gallery")
let clear
try {
clear = gallery.querySelector("button[aria-label='Clear']")
if (clear) {
clear.click()
}
} catch (e) {
console.error(e)
}
try {
// Wait for click-action to complete
const startTime = Date.now()
// 60 seconds in milliseconds
const timeout = 60000
while (clear) {
clear = gallery.querySelector("button[aria-label='Clear']")
if (Date.now() - startTime > timeout) {
throw new Error("image_browser_turnpage: 60 seconds have passed")
}
await image_browser_delay(200)
}
} catch (e) {
console.error(e)
}
await image_browser_unlock()
}
@ -281,14 +293,7 @@ function btnClickHandler(tab_base_tag, btn) {
}
function image_browser_init() {
const GradioVersion = gradioApp().getElementById("image_browser_gradio_version").querySelector("textarea").value
if (isVersionSmaller(GradioVersion, "3.17")) {
image_browser_oldGradio = true
image_browser_galleryItemName = "gallery-item"
} else {
image_browser_oldGradio = false
image_browser_galleryItemName = "thumbnail-item"
}
image_browser_galleryItemName = "thumbnail-item"
image_browser_image_browser_galleryItemNameDot = "." + image_browser_galleryItemName
const tab_base_tags = gradioApp().getElementById("image_browser_tab_base_tags_list")
@ -344,11 +349,7 @@ function image_browser_start() {
const current_tab = image_browser_current_tab()
image_browser_wait_for_gallery_btn(current_tab).then(() => {
let gallery_btn
if (image_browser_oldGradio) {
gallery_btn = gradioApp().getElementById(current_tab + "_image_browser_gallery").getElementsByClassName(image_browser_galleryItemName + ' !flex-none !h-9 !w-9 transition-all duration-75 !ring-2 !ring-orange-500 hover:!ring-orange-500 svelte-1g9btlg')
} else {
gallery_btn = gradioApp().getElementById(current_tab + "_image_browser_gallery").querySelector(image_browser_image_browser_galleryItemNameDot + ' .selected')
}
gallery_btn = gradioApp().getElementById(current_tab + "_image_browser_gallery").querySelector(image_browser_image_browser_galleryItemNameDot + ' .selected')
gallery_btn = gallery_btn && gallery_btn.length > 0 ? gallery_btn[0] : null
if (gallery_btn) {
image_browser_click_image.call(gallery_btn)

5
scripts/image_browser.py
View File

@ -23,6 +23,7 @@ from modules.shared import opts, cmd_opts
from modules.ui_common import plaintext_to_html
from modules.ui_components import ToolButton, DropdownMulti
from PIL import Image, UnidentifiedImageError
from packaging import version
from pathlib import Path
from typing import List, Tuple
from itertools import chain
@ -162,6 +163,10 @@ if logger.isEnabledFor(logging.DEBUG):
logger.debug(os.path.realpath(__file__))
logger.debug([str(tab) for tab in tabs_list])
gradio_needed = "3.23.0"
if version.parse(gr.__version__) < version.parse(gradio_needed):
raise Exception(f"GradioException: You are running Gradio version {gr.__version__}. This version of the extension requires at least Gradio version {gradio_needed}.\nFor more details see https://github.com/AlUlkesh/stable-diffusion-webui-images-browser/issues/116#issuecomment-1493259585")
def delete_recycle(filename):
if opts.image_browser_delete_recycle and send2trash_installed:
send2trash(filename)