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

Move book extraction out of Container constructor

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-17 16:34:48 +05:30
parent 15d9fc23f2
commit 51fddd3415
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/srv/render_book.py
View File

@ -225,12 +225,11 @@ class Container(ContainerBase):
tweak_mode = True tweak_mode = True
def __init__( def __init__(
self, path_to_ebook, tdir, log=None, book_hash=None, save_bookmark_data=False, self, book_fmt, opfpath, input_fmt, tdir, log=None, book_hash=None, save_bookmark_data=False,
book_metadata=None, allow_no_cover=True, virtualize_resources=True book_metadata=None, allow_no_cover=True, virtualize_resources=True
): ):
log = log or default_log log = log or default_log
self.allow_no_cover = allow_no_cover self.allow_no_cover = allow_no_cover
book_fmt, opfpath, input_fmt = extract_book(path_to_ebook, tdir, log=log)
ContainerBase.__init__(self, tdir, opfpath, log) ContainerBase.__init__(self, tdir, opfpath, log)
self.book_metadata = book_metadata self.book_metadata = book_metadata
if save_bookmark_data: if save_bookmark_data:
@ -686,8 +685,10 @@ def render(pathtoebook, output_dir, book_hash=None, serialize_metadata=False, ex
from calibre.customize.ui import quick_metadata from calibre.customize.ui import quick_metadata
with lopen(pathtoebook, 'rb') as f, quick_metadata: with lopen(pathtoebook, 'rb') as f, quick_metadata:
mi = get_metadata(f, os.path.splitext(pathtoebook)[1][1:].lower()) mi = get_metadata(f, os.path.splitext(pathtoebook)[1][1:].lower())
book_fmt, opfpath, input_fmt = extract_book(pathtoebook, output_dir, log=default_log)
container = Container( container = Container(
pathtoebook, output_dir, book_hash=book_hash, save_bookmark_data=extract_annotations, book_fmt, opfpath, input_fmt, output_dir, book_hash=book_hash,
save_bookmark_data=extract_annotations,
book_metadata=mi, virtualize_resources=virtualize_resources book_metadata=mi, virtualize_resources=virtualize_resources
) )
if serialize_metadata: if serialize_metadata: