mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2024-06-07 21:20:49 +00:00
improve filename matching for mask
we should not rely that mask filename will be of the same extension as the image filename so better pattern matching is added
This commit is contained in:
parent
20ae71faa8
commit
c8e67b6732
@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
|
from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
|
||||||
@ -53,7 +54,11 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
|
|||||||
|
|
||||||
if is_inpaint_batch:
|
if is_inpaint_batch:
|
||||||
# try to find corresponding mask for an image using simple filename matching
|
# try to find corresponding mask for an image using simple filename matching
|
||||||
mask_image_path = os.path.join(inpaint_mask_dir, os.path.basename(image))
|
path = Path(os.path.join(inpaint_mask_dir, os.path.basename(image)))
|
||||||
|
mask_image_path = list(path.parent.glob(f"**/{path.stem}*"))
|
||||||
|
if len(mask_image_path) > 0:
|
||||||
|
mask_image_path = str(mask_image_path[0])
|
||||||
|
|
||||||
# if not found use first one ("same mask for all images" use-case)
|
# if not found use first one ("same mask for all images" use-case)
|
||||||
if mask_image_path not in inpaint_masks:
|
if mask_image_path not in inpaint_masks:
|
||||||
mask_image_path = inpaint_masks[0]
|
mask_image_path = inpaint_masks[0]
|
||||||
|
Loading…
Reference in New Issue
Block a user