Merge branch 'AUTOMATIC1111:master' into kr-localization

1 files changed, 17 insertions, 7 deletions

diff --git a/modules/extras.py b/modules/extras.py
index c908b43e..22c5a1c1 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -39,9 +39,12 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
 

         if input_dir == '':

             return outputs, "Please select an input directory.", ''

-        image_list = [file for file in [os.path.join(input_dir, x) for x in os.listdir(input_dir)] if os.path.isfile(file)]

+        image_list = [file for file in [os.path.join(input_dir, x) for x in sorted(os.listdir(input_dir))] if os.path.isfile(file)]

         for img in image_list:

-            image = Image.open(img)

+            try:

+                image = Image.open(img)

+            except Exception:

+                continue

             imageArr.append(image)

             imageNameArr.append(img)

     else:

@@ -118,10 +121,14 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
 

         while len(cached_images) > 2:

             del cached_images[next(iter(cached_images.keys()))]

+        

+        if opts.use_original_name_batch and image_name != None:

+            basename = os.path.splitext(os.path.basename(image_name))[0]

+        else:

+            basename = ''

 

-        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,

-                          forced_filename=image_name if opts.use_original_name_batch else None)

+        images.save_image(image, path=outpath, basename=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, forced_filename=None)

 

         if opts.enable_pnginfo:

             image.info = existing_pnginfo

@@ -216,8 +223,11 @@ def run_modelmerger(primary_model_name, secondary_model_name, teritary_model_nam
     if theta_func1:

         for key in tqdm.tqdm(theta_1.keys()):

             if 'model' in key:

-                t2 = theta_2.get(key, torch.zeros_like(theta_1[key]))

-                theta_1[key] = theta_func1(theta_1[key], t2)

+                if key in theta_2:

+                    t2 = theta_2.get(key, torch.zeros_like(theta_1[key]))

+                    theta_1[key] = theta_func1(theta_1[key], t2)

+                else:

+                    theta_1[key] = torch.zeros_like(theta_1[key])

     del theta_2, teritary_model

 

     for key in tqdm.tqdm(theta_0.keys()):