Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for refactoring, don't read cover if opf.nocover prop is set.

Browse Source
This commit is contained in:
Oliver Graf 2012-07-27 19:43:28 +02:00
parent d13539ddaa
commit aa24da048e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/ebooks/metadata/odt.py
View File

@ -201,15 +201,18 @@ def get_metadata(stream, extract_cover=True):
if cl: if cl:
mi.languages = [cl] mi.languages = [cl]
opfnocover = data.get('opf.nocover', 'false') == 'true' opfnocover = data.get('opf.nocover', 'false') == 'true'
# search for an draw:image in a draw:frame with the name 'opf.cover' if not opfnocover:
# if opf.metadata prop is false, just use the first image that
# has a proper size (borrowed from docx)
try: try:
read_cover(stream, zin, mi, opfmeta, opfnocover, extract_cover) read_cover(stream, zin, mi, opfmeta, extract_cover)
except: except:
pass # Do not let an error reading the cover prevent reading other data pass # Do not let an error reading the cover prevent reading other data
def read_cover(stream, zin, mi, opfmeta, opfnocover, extract_cover): return mi
def read_cover(stream, zin, mi, opfmeta, extract_cover):
# search for an draw:image in a draw:frame with the name 'opf.cover'
# if opf.metadata prop is false, just use the first image that
# has a proper size (borrowed from docx)
otext = odLoad(stream) otext = odLoad(stream)
cover_href = None cover_href = None
cover_data = None cover_data = None
@ -239,7 +242,7 @@ def read_cover(stream, zin, mi, opfmeta, opfnocover, extract_cover):
if not opfmeta: if not opfmeta:
break break
if not opfnocover and cover_href is not None: if cover_href is not None:
mi.cover = cover_href mi.cover = cover_href
if extract_cover: if extract_cover:
if not cover_data: if not cover_data:
@ -252,5 +255,3 @@ def read_cover(stream, zin, mi, opfmeta, opfnocover, extract_cover):
cover_data = (fmt, raw) cover_data = (fmt, raw)
mi.cover_data = cover_data mi.cover_data = cover_data
return mi