From c04c4b95debd2b31c96a97cf4e46e8047a519881 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Sat, 10 Feb 2024 14:41:32 -0700
Subject: Always add timestamp to displayed image

---
 modules/ui_tempdir.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'modules/ui_tempdir.py')

diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index 85015db5..91f40ea4 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -35,12 +35,7 @@ def save_pil_to_file(self, pil_image, 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
+        return f'{already_saved_as}?{os.path.getmtime(already_saved_as)}'
 
     if shared.opts.temp_dir != "":
         dir = shared.opts.temp_dir
-- 
cgit v1.2.3


From cb52279c3e7cf145cc1b284b6a05c883e6995c9f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 17 Feb 2024 21:30:21 +0300
Subject: Merge pull request #14947 from AUTOMATIC1111/open-button

option "open image button" open the actual dir
---
 modules/ui_tempdir.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'modules/ui_tempdir.py')

diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index 91f40ea4..621ed1ec 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -81,3 +81,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
-- 
cgit v1.2.3


From 024a32a09bb833f467fc351a6ea67132db5299c5 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 26 Feb 2024 12:53:21 +0300
Subject: Merge pull request #15012 from
 light-and-ray/register_tmp_file-also-with-mtime

register_tmp_file also for mtime
---
 modules/ui_tempdir.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/ui_tempdir.py')

diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index 621ed1ec..ecd6bdec 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -35,7 +35,9 @@ def save_pil_to_file(self, pil_image, 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)
-        return f'{already_saved_as}?{os.path.getmtime(already_saved_as)}'
+        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
-- 
cgit v1.2.3