From bd9b3d15e8f631f9475d14a5fd07560c177dc2f3 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Fri, 1 Sep 2023 04:05:58 +0900
Subject: fix batch img2img output dir with script

---
 modules/img2img.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index c81c7ab9..0c6d1af5 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -114,11 +114,14 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
             else:
                 p.override_settings.pop("sd_model_checkpoint", None)
 
+        if output_dir:
+            p.outpath_samples = output_dir
+            p.override_settings['save_to_dirs'] = False
+
         proc = modules.scripts.scripts_img2img.run(p, *args)
+
         if proc is None:
             if output_dir:
-                p.outpath_samples = output_dir
-                p.override_settings['save_to_dirs'] = False
                 if p.n_iter > 1 or p.batch_size > 1:
                     p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
                 else:
-- 
cgit v1.2.3


From 657404b75b2f214a97281afbec1adcb4313d24eb Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:33:43 +0900
Subject: use original filename batch img2img with scripts

---
 modules/img2img.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 0c6d1af5..c1cae22f 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -117,15 +117,14 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
         if output_dir:
             p.outpath_samples = output_dir
             p.override_settings['save_to_dirs'] = False
+            if p.n_iter > 1 or p.batch_size > 1:
+                p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
+            else:
+                p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
 
         proc = modules.scripts.scripts_img2img.run(p, *args)
 
         if proc is None:
-            if output_dir:
-                if p.n_iter > 1 or p.batch_size > 1:
-                    p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
-                else:
-                    p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
             process_images(p)
 
 
-- 
cgit v1.2.3