Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the useless exclude_cover parameter from EbookIterator

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-19 15:53:05 +05:30
parent 3494e09604
commit 20a1857704
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,8 @@ class EbookIterator(BookmarksMixin):
CHARACTERS_PER_PAGE = 1000 CHARACTERS_PER_PAGE = 1000
def __init__(self, pathtoebook, log=None, exclude_cover=False): def __init__(self, pathtoebook, log=None):
self.log = log or default_log self.log = log or default_log
self.exclude_cover = exclude_cover
pathtoebook = pathtoebook.strip() pathtoebook = pathtoebook.strip()
self.pathtoebook = os.path.abspath(pathtoebook) self.pathtoebook = os.path.abspath(pathtoebook)
self.config = DynamicConfig(name='iterator') self.config = DynamicConfig(name='iterator')
@ -143,9 +142,8 @@ class EbookIterator(BookmarksMixin):
self.log.warn('Missing spine item:', repr(spath)) self.log.warn('Missing spine item:', repr(spath))
cover = self.opf.cover cover = self.opf.cover
if cover: if cover and self.ebook_ext in {'lit', 'mobi', 'prc', 'opf', 'fb2',
if not self.exclude_cover and self.ebook_ext in { 'azw', 'azw3'}:
'lit', 'mobi', 'prc', 'opf', 'fb2', 'azw', 'azw3'}:
cfile = os.path.join(self.base, 'calibre_iterator_cover.html') cfile = os.path.join(self.base, 'calibre_iterator_cover.html')
rcpath = os.path.relpath(cover, self.base).replace(os.sep, '/') rcpath = os.path.relpath(cover, self.base).replace(os.sep, '/')
chtml = (TITLEPAGE%prepare_string_for_xml(rcpath, True)).encode('utf-8') chtml = (TITLEPAGE%prepare_string_for_xml(rcpath, True)).encode('utf-8')
@ -154,12 +152,6 @@ class EbookIterator(BookmarksMixin):
self.spine[0:0] = [Spiny(cfile, self.spine[0:0] = [Spiny(cfile,
mime_type='application/xhtml+xml')] mime_type='application/xhtml+xml')]
self.delete_on_exit.append(cfile) self.delete_on_exit.append(cfile)
elif self.exclude_cover and self.ebook_ext == 'epub':
try:
if (len(self.spine) > 1 and self.spine.index(cover) == 0):
self.spine = self.spine[1:]
except ValueError:
pass
if self.opf.path_to_html_toc is not None and \ if self.opf.path_to_html_toc is not None and \
self.opf.path_to_html_toc not in self.spine: self.opf.path_to_html_toc not in self.spine: