lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-01-26 19:09:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add img2img batch use original name setting (#1952)

Browse Source 
makes save filename consistent for both sub-tabs of img2img batch
using original filename is now an option
This commit is contained in:
Dmitriy
2024-11-04 01:47:09 +03:00
committed by GitHub
parent 05b01da01f
commit 99b4912e0d
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/images.py
View File

@@ -674,9 +674,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
if short_filename or seed is None: if short_filename or seed is None:
file_decoration = "" file_decoration = ""
elif opts.save_to_dirs: elif opts.save_to_dirs:
file_decoration = opts.samples_filename_pattern or "[seed]" file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]"
else: else:
file_decoration = opts.samples_filename_pattern or "[seed]-[prompt_spaces]" file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]-[prompt_spaces]"
file_decoration = namegen.apply(file_decoration) + suffix file_decoration = namegen.apply(file_decoration) + suffix

10
modules/img2img.py
View File

@@ -122,16 +122,14 @@ def process_batch(p, input, output_dir, inpaint_mask_dir, args, to_scale=False,
if output_dir: if output_dir:
p.outpath_samples = output_dir p.outpath_samples = output_dir
p.override_settings['save_to_dirs'] = False p.override_settings['save_to_dirs'] = False
p.override_settings['save_images_replace_action'] = "Add number suffix"
if p.n_iter > 1 or p.batch_size > 1: if opts.img2img_batch_use_original_name:
p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]' filename_pattern = f'{image_path.stem}-[generation_number]' if p.n_iter > 1 or p.batch_size > 1 else f'{image_path.stem}'
else: p.override_settings['samples_filename_pattern'] = filename_pattern
p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
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.override_settings.pop('save_images_replace_action', None)
proc = process_images(p) proc = process_images(p)
if not discard_further_results and proc: if not discard_further_results and proc:

2
modules/shared_options.py
View File

@@ -230,7 +230,7 @@ options_templates.update(options_section(('img2img', "img2img", "sd"), {
"img2img_batch_show_results_limit": OptionInfo(32, "Show the first N batch img2img results in UI", gr.Slider, {"minimum": -1, "maximum": 1000, "step": 1}).info('0: disable, -1: show all images. Too many images can cause lag'), "img2img_batch_show_results_limit": OptionInfo(32, "Show the first N batch img2img results in UI", gr.Slider, {"minimum": -1, "maximum": 1000, "step": 1}).info('0: disable, -1: show all images. Too many images can cause lag'),
"overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."), "overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."),
"img2img_autosize": OptionInfo(False, "After loading into Img2img, automatically update Width and Height"), "img2img_autosize": OptionInfo(False, "After loading into Img2img, automatically update Width and Height"),
"img2img_batch_use_original_name": OptionInfo(False, "Save using original filename in img2img batch. Applies to 'Upload' and 'From directory' tabs.").info("Warning: overwriting is possible, based on Settings > Saving images/grids > Saving the image to an existing file.")
})) }))
options_templates.update(options_section(('optimizations', "Optimizations", "sd"), { options_templates.update(options_section(('optimizations', "Optimizations", "sd"), {