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

E-book viewer: Fix a regression that broke viewing of HTMLZ files

Browse Source 
Fixes #1691976 [ebook-viewer cannot open htmlz-files](https://bugs.launchpad.net/calibre/+bug/1691976)
This commit is contained in:
Kovid Goyal 2018-12-01 13:27:10 +05:30
parent 4a5dcef805
commit 5c8f4a10a1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/calibre/ebooks/oeb/iterator/book.py
View File

@ -152,25 +152,29 @@ class EbookIterator(BookmarksMixin):
self.language = None self.language = None
if self.mi.languages: if self.mi.languages:
self.language = self.mi.languages[0].lower() self.language = self.mi.languages[0].lower()
ordered = [i for i in self.opf.spine if i.is_linear] + \
[i for i in self.opf.spine if not i.is_linear]
self.spine = [] self.spine = []
Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, read_links=read_links, Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, read_links=read_links,
run_char_count=run_char_count, from_epub=self.book_format == 'EPUB') run_char_count=run_char_count, from_epub=self.book_format == 'EPUB')
is_comic = input_fmt.lower() in {'cbc', 'cbz', 'cbr', 'cb7'} if input_fmt.lower() == 'htmlz':
for i in ordered: self.spine.append(Spiny(os.path.join(os.path.dirname(self.pathtoopf), 'index.html'), mime_type='text/html'))
spath = i.path else:
mt = None ordered = [i for i in self.opf.spine if i.is_linear] + \
if i.idref is not None: [i for i in self.opf.spine if not i.is_linear]
mt = self.opf.manifest.type_for_id(i.idref) is_comic = input_fmt.lower() in {'cbc', 'cbz', 'cbr', 'cb7'}
if mt is None: for i in ordered:
mt = guess_type(spath)[0] spath = i.path
try: mt = None
self.spine.append(Spiny(spath, mime_type=mt)) if i.idref is not None:
if is_comic: mt = self.opf.manifest.type_for_id(i.idref)
self.spine[-1].is_single_page = True if mt is None:
except: mt = guess_type(spath)[0]
self.log.warn('Missing spine item:', repr(spath)) try:
self.spine.append(Spiny(spath, mime_type=mt))
if is_comic:
self.spine[-1].is_single_page = True
except:
self.log.warn('Missing spine item:', repr(spath))
cover = self.opf.cover cover = self.opf.cover
if cover and self.ebook_ext in {'lit', 'mobi', 'prc', 'opf', 'fb2', if cover and self.ebook_ext in {'lit', 'mobi', 'prc', 'opf', 'fb2',