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

Fix regression where not specifying the --cover option with ebook-convert would cause the existing cover from the source file to get stripped

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-21 12:12:44 -06:00
parent a7a6866889
commit 5074b4feda
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/oeb/transforms/guide.py
View File

@ -38,4 +38,3 @@ class Clean(object):
'title-page', 'copyright-page', 'start'): 'title-page', 'copyright-page', 'start'):
self.oeb.guide.remove(x) self.oeb.guide.remove(x)

11
src/calibre/ebooks/oeb/transforms/metadata.py
View File

@ -94,12 +94,17 @@ class MergeMetadata(object):
cdata = open(mi.cover, 'rb').read() cdata = open(mi.cover, 'rb').read()
elif mi.cover_data and mi.cover_data[-1]: elif mi.cover_data and mi.cover_data[-1]:
cdata = mi.cover_data[1] cdata = mi.cover_data[1]
id = None id = old_cover = None
old_cover = self.oeb.guide.remove('cover') if 'cover' in self.oeb.guide:
self.oeb.guide.remove('titlepage') old_cover = self.oeb.guide['cover']
if cdata:
self.oeb.guide.remove('cover')
self.oeb.guide.remove('titlepage')
if old_cover is not None: if old_cover is not None:
if old_cover.href in self.oeb.manifest.hrefs: if old_cover.href in self.oeb.manifest.hrefs:
item = self.oeb.manifest.hrefs[old_cover.href] item = self.oeb.manifest.hrefs[old_cover.href]
if not cdata:
return item.id
self.oeb.manifest.remove(item) self.oeb.manifest.remove(item)
if cdata: if cdata:
id, href = self.oeb.manifest.generate('cover', 'cover.jpg') id, href = self.oeb.manifest.generate('cover', 'cover.jpg')