FFMpeg-Compressor: Fix some logic
This commit is contained in:
parent
e34b06b507
commit
2f31c22d91
1 changed files with 7 additions and 14 deletions
|
@ -64,23 +64,16 @@ def compress_image(folder, file, target_folder, extension):
|
||||||
|
|
||||||
if (extension == "jpg" or extension == "jpeg" or
|
if (extension == "jpg" or extension == "jpeg" or
|
||||||
(extension == "webp" and not configloader.config['FFMPEG']['WebpRGBA'])):
|
(extension == "webp" and not configloader.config['FFMPEG']['WebpRGBA'])):
|
||||||
|
|
||||||
if has_transparency(Image.open(f'{folder}/{file}')):
|
if has_transparency(Image.open(f'{folder}/{file}')):
|
||||||
printer.warning(f"{file} has transparency. Changing to png...")
|
printer.warning(f"{file} has transparency. Changing to png...")
|
||||||
printer.files(file, os.path.splitext(file)[0], "png", f"{quality}%")
|
extension = ".png"
|
||||||
image.save(f"{target_folder}/{os.path.splitext(file)[0]}.png",
|
|
||||||
optimize=True,
|
|
||||||
minimize_size=True,
|
|
||||||
quality=quality)
|
|
||||||
return f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'
|
|
||||||
|
|
||||||
else:
|
printer.files(file, os.path.splitext(file)[0], extension, f"{quality}%")
|
||||||
printer.files(file, os.path.splitext(file)[0], extension, f"{quality}%")
|
image.save(f"{target_folder}/{os.path.splitext(file)[0]}.{extension}",
|
||||||
image.save(f"{target_folder}/{os.path.splitext(file)[0]}.{extension}",
|
optimize=True,
|
||||||
optimize=True,
|
lossless=configloader.config['IMAGE']['Lossless'],
|
||||||
lossless=configloader.config['IMAGE']['Lossless'],
|
quality=quality,
|
||||||
quality=quality,
|
minimize_size=True)
|
||||||
minimize_size=True)
|
|
||||||
return f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'
|
return f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue