don't override default if output_dir is blank

This commit is contained in:
w-e-w 2023-07-30 00:34:04 +09:00
parent 9857537053
commit 53ccdefc01

View File

@ -105,12 +105,13 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
proc = modules.scripts.scripts_img2img.run(p, *args) proc = modules.scripts.scripts_img2img.run(p, *args)
if proc is None: if proc is None:
p.outpath_samples = output_dir if output_dir:
p.override_settings['save_to_dirs'] = False p.outpath_samples = output_dir
if p.n_iter > 1 or p.batch_size > 1: p.override_settings['save_to_dirs'] = False
p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]' if p.n_iter > 1 or p.batch_size > 1:
else: p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
p.override_settings['samples_filename_pattern'] = f'{image_path.stem}' else:
p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
process_images(p) process_images(p)