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

Viewer: Fix CBC comic files not being viewed correctly. Fixes #1886307 [ebook-viewer not open .cbc](https://bugs.launchpad.net/calibre/+bug/1886307)

Browse Source 
Viewer: Fix Table of Contents not correct for comics.

Note that for both these fixes, you will have to reload the book from
the viewer controls.
This commit is contained in:
Kovid Goyal 2020-07-05 21:07:08 +05:30
parent 300935541f
commit 78c53c9da9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/ebooks/conversion/plugins/comic_input.py
View File

@ -176,6 +176,7 @@ class ComicInput(InputFormatPlugin):
comics_ = [['Comic', os.path.abspath(stream.name)]] comics_ = [['Comic', os.path.abspath(stream.name)]]
stream.close() stream.close()
comics = [] comics = []
num_pages_per_comic = []
for i, x in enumerate(comics_): for i, x in enumerate(comics_):
title, fname = x title, fname = x
cdir = 'comic_%d'%(i+1) if len(comics_) > 1 else '.' cdir = 'comic_%d'%(i+1) if len(comics_) > 1 else '.'
@ -185,8 +186,9 @@ class ComicInput(InputFormatPlugin):
pages = self.get_pages(fname, cdir) pages = self.get_pages(fname, cdir)
if not pages: if not pages:
continue continue
num_pages_per_comic.append(len(pages))
if self.for_viewer: if self.for_viewer:
comics.append((title, pages, [self.create_viewer_wrapper(pages)])) comics.append((title, pages, [self.create_viewer_wrapper(pages, cdir)]))
else: else:
wrappers = self.create_wrappers(pages) wrappers = self.create_wrappers(pages)
comics.append((title, pages, wrappers)) comics.append((title, pages, wrappers))
@ -220,21 +222,37 @@ class ComicInput(InputFormatPlugin):
self._images.extend(comic[1]) self._images.extend(comic[1])
opf.create_spine(spine) opf.create_spine(spine)
if self.for_viewer and cover_href: if self.for_viewer and cover_href:
if os.path.isabs(cover_href):
cover_href = os.path.relpath(cover_href).replace(os.sep, '/')
opf.guide.set_cover(cover_href) opf.guide.set_cover(cover_href)
toc = TOC() toc = TOC()
if len(comics) == 1: if len(comics) == 1:
wrappers = comics[0][2] wrappers = comics[0][2]
if self.for_viewer:
wrapper_page_href = href(wrappers[0])
for i in range(num_pages_per_comic[0]):
toc.add_item('{}#page_{}'.format(wrapper_page_href, i+1), None,
_('Page')+' %d'%(i+1), play_order=i)
else:
for i, x in enumerate(wrappers): for i, x in enumerate(wrappers):
toc.add_item(href(x), None, _('Page')+' %d'%(i+1), toc.add_item(href(x), None, _('Page')+' %d'%(i+1),
play_order=i) play_order=i)
else: else:
po = 0 po = 0
for comic in comics: for num_pages, comic in zip(num_pages_per_comic, comics):
po += 1 po += 1
wrappers = comic[2] wrappers = comic[2]
stoc = toc.add_item(href(wrappers[0]), stoc = toc.add_item(href(wrappers[0]),
None, comic[0], play_order=po) None, comic[0], play_order=po)
if not opts.dont_add_comic_pages_to_toc: if not opts.dont_add_comic_pages_to_toc:
if self.for_viewer:
wrapper_page_href = href(wrappers[0])
for i in range(num_pages):
stoc.add_item('{}#page_{}'.format(wrapper_page_href, i+1), None,
_('Page')+' %d'%(i+1), play_order=po)
po += 1
else:
for i, x in enumerate(wrappers): for i, x in enumerate(wrappers):
stoc.add_item(href(x), None, stoc.add_item(href(x), None,
_('Page')+' %d'%(i+1), play_order=po) _('Page')+' %d'%(i+1), play_order=po)
@ -274,13 +292,13 @@ class ComicInput(InputFormatPlugin):
wrappers.append(page) wrappers.append(page)
return wrappers return wrappers
def create_viewer_wrapper(self, pages): def create_viewer_wrapper(self, pages, cdir):
from calibre.ebooks.oeb.base import XHTML_NS from calibre.ebooks.oeb.base import XHTML_NS
def page(src): def page(pnum, src):
return '<img src="{}"></img>'.format(os.path.basename(src)) return '<img id="page_{}" src="{}"></img>'.format(pnum + 1, os.path.basename(src))
pages = '\n'.join(map(page, pages)) pages = '\n'.join(page(i, src) for i, src in enumerate(pages))
base = os.path.dirname(pages[0]) base = os.path.dirname(pages[0])
wrapper = ''' wrapper = '''
<html xmlns="%s"> <html xmlns="%s">
@ -304,7 +322,7 @@ class ComicInput(InputFormatPlugin):
</body> </body>
</html> </html>
''' % (XHTML_NS, pages) ''' % (XHTML_NS, pages)
path = os.path.join(base, 'wrapper.xhtml') path = os.path.join(base, cdir, 'wrapper.xhtml')
with open(path, 'wb') as f: with open(path, 'wb') as f:
f.write(wrapper.encode('utf-8')) f.write(wrapper.encode('utf-8'))
return path return path