Commit fb2354cb authored by AUTOMATIC's avatar AUTOMATIC
Browse files

reword settings for 4chan export, remove unneded try/excepts, add try/except...

reword settings for 4chan export, remove unneded try/excepts, add try/except for actually saving JPG
parent e572c3ed
Loading
Loading
Loading
Loading
+9 −15
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import string
import json
import hashlib

from modules import sd_samplers, shared, script_callbacks
from modules import sd_samplers, shared, script_callbacks, errors
from modules.shared import opts, cmd_opts

LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS)
@@ -575,25 +575,19 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i

    image.already_saved_as = fullfn

    try:
        target_side_length = int(opts.target_side_length)
    except ValueError:
        target_side_length = 4000
    try:
        img_downscale_threshold = float(opts.img_downscale_threshold)
    except ValueError:
        img_downscale_threshold = 4
    
    oversize = image.width > target_side_length or image.height > target_side_length
    if opts.export_for_4chan and (oversize or os.stat(fullfn).st_size > img_downscale_threshold * 1024 * 1024):
    oversize = image.width > opts.target_side_length or image.height > opts.target_side_length
    if opts.export_for_4chan and (oversize or os.stat(fullfn).st_size > opts.img_downscale_threshold * 1024 * 1024):
        ratio = image.width / image.height

        if oversize and ratio > 1:
            image = image.resize((target_side_length, image.height * target_side_length // image.width), LANCZOS)
            image = image.resize((opts.target_side_length, image.height * opts.target_side_length // image.width), LANCZOS)
        elif oversize:
            image = image.resize((image.width * target_side_length // image.height, target_side_length), LANCZOS)
            image = image.resize((image.width * opts.target_side_length // image.height, opts.target_side_length), LANCZOS)

        try:
            _atomically_save_image(image, fullfn_without_extension, ".jpg")
        except Exception as e:
            errors.display(e, "saving image as downscaled JPG")

    if opts.save_txt and info is not None:
        txt_fullfn = f"{fullfn_without_extension}.txt"
+3 −3
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ options_templates.update(options_section(('saving-images', "Saving images/grids"
    "save_images_before_highres_fix": OptionInfo(False, "Save a copy of image before applying highres fix."),
    "save_images_before_color_correction": OptionInfo(False, "Save a copy of image before applying color correction to img2img results"),
    "jpeg_quality": OptionInfo(80, "Quality for saved jpeg images", gr.Slider, {"minimum": 1, "maximum": 100, "step": 1}),
    "export_for_4chan": OptionInfo(True, "If PNG image is larger than Downscale threshold or any dimension is larger than Target length, downscale the image to dimensions and save a copy as JPG"),
    "img_downscale_threshold": OptionInfo(4, "Downscale threshold (MB)"),
    "target_side_length": OptionInfo(4000, "Target length"),
    "export_for_4chan": OptionInfo(True, "If the saved image file size is above the limit, or its either width or height are above the limit, save a downscaled copy as JPG"),
    "img_downscale_threshold": OptionInfo(4.0, "File size limit for the above option, MB", gr.Number),
    "target_side_length": OptionInfo(4000, "Width/height limit for the above option, in pixels", gr.Number),

    "use_original_name_batch": OptionInfo(True, "Use original name for output filename during batch process in extras tab"),
    "use_upscaler_name_as_suffix": OptionInfo(False, "Use upscaler name as filename suffix in the extras tab"),