Merge changes from dev

1 files changed, 6 insertions, 5 deletions

diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 0c59fad4..7449b0dc 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -2,7 +2,7 @@ import os
 

 from PIL import Image

 

-from modules import shared, images, devices, scripts, scripts_postprocessing, ui_common, generation_parameters_copypaste

+from modules import shared, images, devices, scripts, scripts_postprocessing, ui_common, infotext_utils

 from modules.shared import opts

 

 

@@ -86,7 +86,7 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
                 basename = ''

                 forced_filename = None

 

-            infotext = ", ".join([k if k == v else f'{k}: {generation_parameters_copypaste.quote(v)}' for k, v in pp.info.items() if v is not None])

+            infotext = ", ".join([k if k == v else f'{k}: {infotext_utils.quote(v)}' for k, v in pp.info.items() if v is not None])

 

             if opts.enable_pnginfo:

                 pp.image.info = existing_pnginfo

@@ -97,11 +97,12 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
 

                 if pp.caption:

                     caption_filename = os.path.splitext(fullfn)[0] + ".txt"

-                    if os.path.isfile(caption_filename):

+                    existing_caption = ""

+                    try:

                         with open(caption_filename, encoding="utf8") as file:

                             existing_caption = file.read().strip()

-                    else:

-                        existing_caption = ""

+                    except FileNotFoundError:

+                        pass

 

                     action = shared.opts.postprocessing_existing_caption_action

                     if action == 'Prepend' and existing_caption: