Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-03-18 23:47:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2026-01-19 11:08:36 +05:30
parent 397ddf23fd
commit 3ef90d6a36
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/oeb/polish/check/images.py
View File

@ -32,9 +32,8 @@ class CMYKImage(BaseError):
level = WARN
def __call__(self, container):
from qt.core import QImage
from calibre.gui2 import pixmap_to_data
from calibre.utils.img import image_from_data
ext = container.mime_map[self.name].split('/')[-1].upper()
if ext == 'JPG':
ext = 'JPEG'
@ -42,8 +41,7 @@ class CMYKImage(BaseError):
return False
with container.open(self.name, 'r+b') as f:
raw = f.read()
i = QImage()
i.loadFromData(raw)
i = image_from_data(raw)
if i.isNull():
return False
raw = pixmap_to_data(i, format=ext, quality=95)

12
src/calibre/gui2/library/models.py
View File

@ -47,6 +47,7 @@ from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import device_prefs, prefs, tweaks
from calibre.utils.date import UNDEFINED_DATE, dt_factory, is_date_undefined, qt_from_dt, qt_to_dt
from calibre.utils.icu import sort_key
from calibre.utils.img import image_from_data
from calibre.utils.localization import calibre_langcode_to_name, ngettext
from calibre.utils.resources import get_path as P
from calibre.utils.search_query_parser import ParseException, SearchQueryParser
@ -881,11 +882,8 @@ class BooksModel(QAbstractTableModel): # {{{
if not data:
return self.default_image
img = QImage()
img.loadFromData(data)
if img.isNull():
img = self.default_image
return img
img = image_from_data(data)
return self.default_image if img.isNull() else img
def build_data_convertors(self):
rating_fields = {}
@ -1787,9 +1785,9 @@ class DeviceBooksModel(BooksModel): # {{{
img.load(cdata.image_path)
elif cdata:
if isinstance(cdata, (tuple, list)):
img.loadFromData(cdata[-1])
img = image_from_data(cdata[-1])
else:
img.loadFromData(cdata)
img = image_from_data(cdata)
if img.isNull():
img = self.default_image
return img