lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-04-30 03:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add safe get override_setting for processing (#2253)

Browse Source
This commit is contained in:
Dmitriy
2024-11-04 20:00:11 +03:00
committed by GitHub
parent 4d75507c3d
commit e2fe29c104
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/images.py
View File

@@ -642,7 +642,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
Additional PNG info. `existing_info == {pngsectionname: info, ...}` Additional PNG info. `existing_info == {pngsectionname: info, ...}`
no_prompt: no_prompt:
TODO I don't know its meaning. TODO I don't know its meaning.
p (`StableDiffusionProcessing`) p (`StableDiffusionProcessing` or `Processing`)
forced_filename (`str`): forced_filename (`str`):
If specified, `basename` and filename pattern will be ignored. If specified, `basename` and filename pattern will be ignored.
save_to_dirs (bool): save_to_dirs (bool):
@@ -673,10 +673,13 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
if forced_filename is None: if forced_filename is None:
if short_filename or seed is None: if short_filename or seed is None:
file_decoration = "" file_decoration = ""
elif opts.save_to_dirs: elif hasattr(p, 'override_settings'):
file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]" file_decoration = p.override_settings.get("samples_filename_pattern")
else: else:
file_decoration = opts.samples_filename_pattern or p.override_settings.get("samples_filename_pattern") or "[seed]-[prompt_spaces]" file_decoration = None
if file_decoration is None:
file_decoration = opts.samples_filename_pattern or ("[seed]" if opts.save_to_dirs else "[seed]-[prompt_spaces]")
file_decoration = namegen.apply(file_decoration) + suffix file_decoration = namegen.apply(file_decoration) + suffix