From f9f9d04b5fa9ffb6e0462fa691aee8fcc1bb733c Mon Sep 17 00:00:00 2001 From: JustAnOkapi Date: Tue, 13 Sep 2022 15:28:03 -0500 Subject: prevent extras from saving in dir Extras have none of the vars used in dir names, so they cant be saved into dirs. +grid code cleanup --- modules/images.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/images.py') diff --git a/modules/images.py b/modules/images.py index 702c5609..d48a8ab2 100644 --- a/modules/images.py +++ b/modules/images.py @@ -280,10 +280,7 @@ def apply_filename_pattern(x, p, seed, prompt): return x -def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, pnginfo_section_name='parameters', p=None, existing_info=None): - # would be better to add this as an argument in future, but will do for now - is_a_grid = basename != "" - +def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, grid=False, pnginfo_section_name='parameters', p=None, existing_info=None): if short_filename or prompt is None or seed is None: file_decoration = "" elif opts.save_to_dirs: @@ -307,7 +304,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i else: pnginfo = None - save_to_dirs = (is_a_grid and opts.grid_save_to_dirs) or (not is_a_grid and opts.save_to_dirs) + save_to_dirs = (grid and opts.grid_save_to_dirs) or (not grid and opts.save_to_dirs and not no_prompt) if save_to_dirs: dirname = apply_filename_pattern(opts.directories_filename_pattern or "[prompt_words]", p, seed, prompt) -- cgit v1.2.3