Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Eh, okay-ish optipng compromise

Browse Source
This commit is contained in:
NiLuJe 2019-05-24 06:37:05 +02:00
parent bdb767c9b7
commit d2772a2916
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/devices/kobo/driver.py
View File

@ -30,7 +30,7 @@ from calibre.devices.kobo.books import ImageWrapper
from calibre.devices.mime import mime_type_ext from calibre.devices.mime import mime_type_ext
from calibre.devices.usbms.driver import USBMS, debug_print from calibre.devices.usbms.driver import USBMS, debug_print
from calibre import prints, fsync from calibre import prints, fsync
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile, better_mktemp
from calibre.constants import DEBUG from calibre.constants import DEBUG
from calibre.utils.config_base import prefs from calibre.utils.config_base import prefs
from polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes from polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes
@ -2697,6 +2697,7 @@ class KOBOTOUCH(KOBO):
def _upload_cover(self, path, filename, metadata, filepath, upload_grayscale, dithered_covers=False, keep_cover_aspect=False, letterbox_fs_covers=False, png_covers=False): def _upload_cover(self, path, filename, metadata, filepath, upload_grayscale, dithered_covers=False, keep_cover_aspect=False, letterbox_fs_covers=False, png_covers=False):
from calibre.utils.imghdr import identify from calibre.utils.imghdr import identify
from calibre.utils.img import optimize_png_fast
debug_print("KoboTouch:_upload_cover - filename='%s' upload_grayscale='%s' dithered_covers='%s' "%(filename, upload_grayscale, dithered_covers)) debug_print("KoboTouch:_upload_cover - filename='%s' upload_grayscale='%s' dithered_covers='%s' "%(filename, upload_grayscale, dithered_covers))
if not metadata.cover: if not metadata.cover:
@ -2777,9 +2778,21 @@ class KOBOTOUCH(KOBO):
# Return the data resized and properly grayscaled/dithered/letterboxed if requested # Return the data resized and properly grayscaled/dithered/letterboxed if requested
data = self._create_cover_data(cover_data, resize_to, expand_to, kobo_size, upload_grayscale, dithered_covers, keep_cover_aspect, is_full_size, letterbox, png_covers) data = self._create_cover_data(cover_data, resize_to, expand_to, kobo_size, upload_grayscale, dithered_covers, keep_cover_aspect, is_full_size, letterbox, png_covers)
with lopen(fpath, 'wb') as f: # NOTE: If we're writing a PNG file, go through a quick optipng pass to make sure it's encoded properly, as Qt doesn't afford us enough control to do it right...
f.write(data) # Unfortunately, optipng doesn't support reading pipes, so this gets a bit clunky as we have go through a temporary file...
fsync(f) if png_covers:
tmp_cover = better_mktemp()
with lopen(tmp_cover, 'wb') as f:
f.write(data)
optimize_png_fast(tmp_cover)
# Crossing FS boundaries, can't rename, have to copy + delete :/
shutil.copy2(tmp_cover, fpath)
os.remove(tmp_cover)
else:
with lopen(fpath, 'wb') as f:
f.write(data)
fsync(f)
except Exception as e: except Exception as e:
err = unicode_type(e) err = unicode_type(e)
debug_print("KoboTouch:_upload_cover - Exception string: %s"%err) debug_print("KoboTouch:_upload_cover - Exception string: %s"%err)

6
src/calibre/utils/img.py
View File

@ -560,6 +560,12 @@ def optimize_png(file_path):
cmd = [exe] + '-fix -clobber -strip all -o7 -out'.split() + [False, True] cmd = [exe] + '-fix -clobber -strip all -o7 -out'.split() + [False, True]
return run_optimizer(file_path, cmd) return run_optimizer(file_path, cmd)
# Use -o1 to make it much, much faster, when we only care about re-encoding, and not recompression.
def optimize_png_fast(file_path):
exe = get_exe_path('optipng')
cmd = [exe] + '-fix -clobber -strip all -o1 -out'.split() + [False, True]
return run_optimizer(file_path, cmd)
def encode_jpeg(file_path, quality=80): def encode_jpeg(file_path, quality=80):
from calibre.utils.speedups import ReadOnlyFileBuffer from calibre.utils.speedups import ReadOnlyFileBuffer