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

Merge branch 'py3' of https://github.com/eli-schwartz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-23 10:30:19 +05:30
commit 22b1a4843b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/oeb/polish/check/opf.py
View File

@ -370,7 +370,7 @@ def check_opf(container):
errors.append(IncorrectCover(container.opf_name, cover.sourceline, cover.get('content', ''))) errors.append(IncorrectCover(container.opf_name, cover.sourceline, cover.get('content', '')))
raw = etree.tostring(cover) raw = etree.tostring(cover)
try: try:
n, c = raw.index('name="'), raw.index('content="') n, c = raw.index(b'name="'), raw.index(b'content="')
except ValueError: except ValueError:
n = c = -1 n = c = -1
if n > -1 and c > -1 and n > c: if n > -1 and c > -1 and n > c:

4
src/calibre/ebooks/oeb/polish/cover.py
View File

@ -393,8 +393,10 @@ def create_epub_cover(container, cover_path, existing_image, options=None):
titlepage_item = container.generate_item(tname, id_prefix='titlepage') titlepage_item = container.generate_item(tname, id_prefix='titlepage')
titlepage = container.href_to_name(titlepage_item.get('href'), titlepage = container.href_to_name(titlepage_item.get('href'),
container.opf_name) container.opf_name)
raw = templ%container.name_to_href(raster_cover, titlepage).encode('utf-8') raw = templ % container.name_to_href(raster_cover, titlepage)
with container.open(titlepage, 'wb') as f: with container.open(titlepage, 'wb') as f:
if not isinstance(raw, bytes):
raw = raw.encode('utf-8')
f.write(raw) f.write(raw)
# We have to make sure the raster cover item has id="cover" for the moron # We have to make sure the raster cover item has id="cover" for the moron