From 2288bc96fdd3cef87497a320b56df62aa4052fc9 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Fri, 16 Sep 2022 12:43:24 +0300
Subject: fix extras tab showing original images instead of upscales

---
 modules/extras.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules/extras.py')

diff --git a/modules/extras.py b/modules/extras.py
index ffae7d67..38d6ec48 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -36,6 +36,7 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
 
     outpath = opts.outdir_samples or opts.outdir_extras_samples
 
+    outputs = []
     for image in imageArr:
         existing_pnginfo = image.info or {}
 
@@ -91,7 +92,9 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
 
         images.save_image(image, path=outpath, basename="", seed=None, prompt=None, extension=opts.samples_format, info=info, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo)
 
-    return imageArr, plaintext_to_html(info), ''
+        outputs.append(image)
+
+    return outputs, plaintext_to_html(info), ''
 
 
 def run_pnginfo(image):
-- 
cgit v1.2.3


From de5bfdf9177d7035c76a890c241f8a5a32455cad Mon Sep 17 00:00:00 2001
From: JJ <jjisnow@gmail.com>
Date: Sat, 17 Sep 2022 06:48:22 +1000
Subject: image info tab

* handles exceptions if jpeg jfif data not present
* removes further non-comment related exif data.
---
 modules/extras.py | 7 ++++---
 modules/ui.py     | 4 ++--
 webui.py          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules/extras.py')

diff --git a/modules/extras.py b/modules/extras.py
index 38d6ec48..64b4f2b6 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -97,7 +97,7 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
     return outputs, plaintext_to_html(info), ''
 
 
-def run_pnginfo(image):
+def run_image_info(image):
     items = image.info
 
     if "exif" in image.info:
@@ -111,8 +111,9 @@ def run_pnginfo(image):
 
         items['exif comment'] = exif_comment
 
-        for field in ['jfif', 'jfif_version', 'jfif_unit', 'jfif_density', 'dpi', 'exif']:
-            del items[field]
+        for field in ['jfif', 'jfif_version', 'jfif_unit', 'jfif_density', 'dpi', 'exif',
+                      'loop', 'background', 'timestamp', 'duration']:
+            items.pop(field, None)
 
 
     info = ''
diff --git a/modules/ui.py b/modules/ui.py
index 738ac945..0899490f 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -295,7 +295,7 @@ def create_toprow(is_img2img):
     return prompt, roll, prompt_style, negative_prompt, prompt_style2, submit, interrogate, prompt_style_apply, save_style, check_progress
 
 
-def create_ui(txt2img, img2img, run_extras, run_pnginfo):
+def create_ui(txt2img, img2img, run_extras, run_image_info):
     with gr.Blocks(analytics_enabled=False) as txt2img_interface:
         txt2img_prompt, roll, txt2img_prompt_style, txt2img_negative_prompt, txt2img_prompt_style2, submit, _, txt2img_prompt_style_apply, txt2img_save_style, check_progress = create_toprow(is_img2img=False)
 
@@ -697,7 +697,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
         submit.click(**extras_args)
 
     pnginfo_interface = gr.Interface(
-        wrap_gradio_call(run_pnginfo),
+        wrap_gradio_call(run_image_info),
         inputs=[
             gr.Image(label="Source", source="upload", interactive=True, type="pil"),
         ],
diff --git a/webui.py b/webui.py
index add72123..cbfb62f0 100644
--- a/webui.py
+++ b/webui.py
@@ -121,7 +121,7 @@ def webui():
         txt2img=wrap_gradio_gpu_call(modules.txt2img.txt2img),
         img2img=wrap_gradio_gpu_call(modules.img2img.img2img),
         run_extras=wrap_gradio_gpu_call(modules.extras.run_extras),
-        run_pnginfo=modules.extras.run_pnginfo
+        run_image_info=modules.extras.run_image_info
     )
 
     demo.launch(
-- 
cgit v1.2.3


From 047a623f7a5c585d308d25268763f76ea225f9a0 Mon Sep 17 00:00:00 2001
From: jjisnow <jjisnow@gmail.com>
Date: Sat, 17 Sep 2022 16:07:07 +1000
Subject: Restore run_pnginfo

---
 modules/extras.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/extras.py')

diff --git a/modules/extras.py b/modules/extras.py
index 64b4f2b6..3d9d9f7a 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -97,7 +97,7 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
     return outputs, plaintext_to_html(info), ''
 
 
-def run_image_info(image):
+def run_pnginfo(image):
     items = image.info
 
     if "exif" in image.info:
-- 
cgit v1.2.3