AUTOMATIC1111/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2026-03-07 06:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into gradio4

Browse Source
This commit is contained in:
AUTOMATIC1111
2024-03-02 08:27:22 +03:00
parent 3ee79332b1 bb24c13ed7
commit f7a3067d2a
59 changed files with 1129 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ui_tempdir.py
View File

@@ -46,12 +46,9 @@ def save_pil_to_file(pil_image, cache_dir=None, format="png"):
already_saved_as = getattr(pil_image, 'already_saved_as', None)
if already_saved_as and os.path.isfile(already_saved_as):
register_tmp_file(shared.demo, already_saved_as)
filename = already_saved_as
if not shared.opts.save_images_add_number:
filename += f'?{os.path.getmtime(already_saved_as)}'
return filename
filename_with_mtime = f'{already_saved_as}?{os.path.getmtime(already_saved_as)}'
register_tmp_file(shared.demo, filename_with_mtime)
return filename_with_mtime
if shared.opts.temp_dir:
dir = shared.opts.temp_dir
@@ -179,3 +176,18 @@ def cleanup_tmpdr():
filename = os.path.join(root, name)
os.remove(filename)
def is_gradio_temp_path(path):
"""
Check if the path is a temp dir used by gradio
"""
path = Path(path)
if shared.opts.temp_dir and path.is_relative_to(shared.opts.temp_dir):
return True
if gradio_temp_dir := os.environ.get("GRADIO_TEMP_DIR"):
if path.is_relative_to(gradio_temp_dir):
return True
if path.is_relative_to(Path(tempfile.gettempdir()) / "gradio"):
return True
return False