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

FB2 Output: Merge ifs

Browse Source
This commit is contained in:
Andrey Efremov 2019-10-09 12:18:31 +07:00
parent c42d2db421
commit 3e680ac307
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/fb2/fb2ml.py
View File

@ -471,8 +471,7 @@ class FB2MLizer(object):
# Process the XHTML tag and styles. Converted to an FB2 tag. # Process the XHTML tag and styles. Converted to an FB2 tag.
# Use individual if statement not if else. There can be # Use individual if statement not if else. There can be
# only one XHTML tag but it can have multiple styles. # only one XHTML tag but it can have multiple styles.
if tag == 'img': if tag == 'img' and elem_tree.attrib.get('src', None):
if elem_tree.attrib.get('src', None):
# Only write the image tag if it is in the manifest. # Only write the image tag if it is in the manifest.
ihref = urlnormalize(page.abshref(elem_tree.attrib['src'])) ihref = urlnormalize(page.abshref(elem_tree.attrib['src']))
if ihref in self.oeb_book.manifest.hrefs: if ihref in self.oeb_book.manifest.hrefs:
@ -483,7 +482,7 @@ class FB2MLizer(object):
tags += p_tag tags += p_tag
fb2_out.append('<image l:href="#%s"/>' % self.image_hrefs[ihref]) fb2_out.append('<image l:href="#%s"/>' % self.image_hrefs[ihref])
else: else:
self.log.warn(u'Ignoring image not in manifest: %s'%ihref) self.log.warn(u'Ignoring image not in manifest: %s' % ihref)
if tag in ('br', 'hr') or ems >= 1: if tag in ('br', 'hr') or ems >= 1:
if ems < 1: if ems < 1:
multiplier = 1 multiplier = 1