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

More EPUB metadata speedups

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-16 08:28:56 +05:30
parent fca3f5d24b
commit bab29014b1
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/ebooks/metadata/epub.py
View File

@ -16,7 +16,7 @@ from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup
from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata import MetaInformation
from calibre.ebooks.metadata.opf import get_metadata as get_metadata_from_opf from calibre.ebooks.metadata.opf import get_metadata as get_metadata_from_opf
from calibre.ebooks.metadata.opf2 import OPF from calibre.ebooks.metadata.opf2 import OPF
from calibre.ptempfile import TemporaryDirectory, PersistentTemporaryFile from calibre.ptempfile import TemporaryDirectory
from calibre import CurrentDir, walk from calibre import CurrentDir, walk
from calibre.constants import isosx from calibre.constants import isosx
from calibre.utils.localization import lang_as_iso639_1 from calibre.utils.localization import lang_as_iso639_1
@ -119,6 +119,9 @@ class OCFReader(OCF):
self._encryption_meta_cached = Encryption(None) self._encryption_meta_cached = Encryption(None)
return self._encryption_meta_cached return self._encryption_meta_cached
def read_bytes(self, name):
return self.open(name).read()
class OCFZipReader(OCFReader): class OCFZipReader(OCFReader):
def __init__(self, stream, mode='r', root=None): def __init__(self, stream, mode='r', root=None):
@ -143,6 +146,9 @@ class OCFZipReader(OCFReader):
return self.archive.open(name) return self.archive.open(name)
return StringIO(self.archive.read(name)) return StringIO(self.archive.read(name))
def read_bytes(self, name):
return self.archive.read(name)
def get_zip_reader(stream, root=None): def get_zip_reader(stream, root=None):
try: try:
zf = ZipFile(stream, mode='r') zf = ZipFile(stream, mode='r')
@ -232,8 +238,8 @@ def get_metadata(stream, extract_cover=True):
""" Return metadata as a :class:`Metadata` object """ """ Return metadata as a :class:`Metadata` object """
stream.seek(0) stream.seek(0)
reader = get_zip_reader(stream) reader = get_zip_reader(stream)
opfstream = reader.open(reader.opf_path) opfbytes = reader.read_bytes(reader.opf_path)
mi, ver, raster_cover, first_spine_item = get_metadata_from_opf(opfstream) mi, ver, raster_cover, first_spine_item = get_metadata_from_opf(opfbytes)
if extract_cover: if extract_cover:
base = posixpath.dirname(reader.opf_path) base = posixpath.dirname(reader.opf_path)
if raster_cover: if raster_cover:
@ -253,12 +259,9 @@ def get_metadata(stream, extract_cover=True):
def get_quick_metadata(stream): def get_quick_metadata(stream):
return get_metadata(stream, False) return get_metadata(stream, False)
def _write_new_cover(new_cdata, cpath): def serialize_cover_data(new_cdata, cpath):
from calibre.utils.img import save_cover_data_to from calibre.utils.img import save_cover_data_to
new_cover = PersistentTemporaryFile(suffix=os.path.splitext(cpath)[1]) return save_cover_data_to(new_cdata, data_fmt=os.path.splitext(cpath)[1][1:])
new_cover.close()
save_cover_data_to(new_cdata, new_cover.name)
return new_cover
def normalize_languages(opf_languages, mi_languages): def normalize_languages(opf_languages, mi_languages):
' Preserve original country codes and use 2-letter lang codes where possible ' ' Preserve original country codes and use 2-letter lang codes where possible '
@ -314,7 +317,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False, force_ide
new_cdata = open(mi.cover, 'rb').read() new_cdata = open(mi.cover, 'rb').read()
except: except:
pass pass
new_cover = cpath = None cpath = None
if new_cdata and raster_cover: if new_cdata and raster_cover:
try: try:
cpath = posixpath.join(posixpath.dirname(reader.opf_path), cpath = posixpath.join(posixpath.dirname(reader.opf_path),
@ -322,8 +325,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False, force_ide
cover_replacable = not reader.encryption_meta.is_encrypted(cpath) and \ cover_replacable = not reader.encryption_meta.is_encrypted(cpath) and \
os.path.splitext(cpath)[1].lower() in ('.png', '.jpg', '.jpeg') os.path.splitext(cpath)[1].lower() in ('.png', '.jpg', '.jpeg')
if cover_replacable: if cover_replacable:
new_cover = _write_new_cover(new_cdata, cpath) replacements[cpath] = serialize_cover_data(new_cdata, cpath)
replacements[cpath] = open(new_cover.name, 'rb')
except Exception: except Exception:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
@ -331,7 +333,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False, force_ide
update_metadata(reader.opf, mi, apply_null=apply_null, update_metadata(reader.opf, mi, apply_null=apply_null,
update_timestamp=update_timestamp, force_identifiers=force_identifiers) update_timestamp=update_timestamp, force_identifiers=force_identifiers)
newopf = StringIO(reader.opf.render()) newopf = reader.opf.render()
if isinstance(reader.archive, LocalZipFile): if isinstance(reader.archive, LocalZipFile):
reader.archive.safe_replace(reader.container[OPF.MIMETYPE], newopf, reader.archive.safe_replace(reader.container[OPF.MIMETYPE], newopf,
extra_replacements=replacements) extra_replacements=replacements)