Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-19 01:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix control save image

Browse Source
This commit is contained in:
Vladimir Mandic
2024-05-14 16:44:13 -04:00
parent 894a1986f3
commit 024407fc72
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/images.py
+4 -1
View File
@@ -632,6 +632,8 @@ def save_image(image, path, basename='', seed=None, prompt=None, extension=share
forced_filename += suffix if suffix is not None else ''
filename = os.path.join(path, f"{forced_filename}.{extension}") if basename == '' else os.path.join(path, f"{basename}-{forced_filename}.{extension}")
pnginfo = existing_info or {}
if info is None:
info = image.info.get(pnginfo_section_name, '')
if info is not None:
pnginfo[pnginfo_section_name] = info
params = script_callbacks.ImageSaveParams(image, p, filename, pnginfo)
@@ -644,7 +646,8 @@ def save_image(image, path, basename='', seed=None, prompt=None, extension=share
# callbacks
script_callbacks.before_image_saved_callback(params)
exifinfo = params.pnginfo.get('UserComment', '')
exifinfo = (exifinfo + ', ' if len(exifinfo) > 0 else '') + params.pnginfo.get(pnginfo_section_name, '')
exifinfo = exifinfo + ', ' if len(exifinfo) > 0 else ''
exifinfo += params.pnginfo.get(pnginfo_section_name, '')
filename, extension = os.path.splitext(params.filename)
filename_txt = f"{filename}.txt" if shared.opts.save_txt and len(exifinfo) > 0 else None
save_queue.put((params.image, filename, extension, params, exifinfo, filename_txt)) # actual save is executed in a thread that polls data from queue
modules/ui_common.py
+2
View File
@@ -154,6 +154,8 @@ def save_files(js_data, files, html_info, index):
else:
image = generation_parameters_copypaste.image_from_url_text(filedata)
info = p.infotexts[i + 1] if len(p.infotexts) > len(p.all_seeds) else p.infotexts[i] # infotexts may be offset by 1 because the first image is the grid
if len(info) == 0:
info = None
fullfn, txt_fullfn = images.save_image(image, shared.opts.outdir_save, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], info=info, extension=shared.opts.samples_format, grid=is_grid, p=p)
if fullfn is None:
continue