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

FB2 Output: Fix images being ignored when converting a EPUB with image filenames that contain URL unsafe characters. Fixes #1173351 (epub to fb2 converter doesn't keep pictures but the frontpage.)

Browse Source
This commit is contained in:
Kovid Goyal 2013-04-27 12:38:14 +05:30
parent bd9e63ca92
commit 30de50d4a9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ from calibre import prepare_string_for_xml
from calibre.constants import __appname__, __version__ from calibre.constants import __appname__, __version__
from calibre.utils.magick import Image from calibre.utils.magick import Image
from calibre.utils.localization import lang_as_iso639_1 from calibre.utils.localization import lang_as_iso639_1
from calibre.ebooks.oeb.base import urlnormalize
class FB2MLizer(object): class FB2MLizer(object):
''' '''
@ -281,7 +282,7 @@ class FB2MLizer(object):
data += char data += char
images.append('<binary id="%s" content-type="image/jpeg">%s\n</binary>' % (self.image_hrefs[item.href], data)) images.append('<binary id="%s" content-type="image/jpeg">%s\n</binary>' % (self.image_hrefs[item.href], data))
except Exception as e: except Exception as e:
self.log.error('Error: Could not include file %s because ' \ self.log.error('Error: Could not include file %s because '
'%s.' % (item.href, e)) '%s.' % (item.href, e))
return ''.join(images) return ''.join(images)
@ -420,13 +421,16 @@ class FB2MLizer(object):
if tag == 'img': if tag == 'img':
if 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.
if page.abshref(elem_tree.attrib['src']) in self.oeb_book.manifest.hrefs.keys(): ihref = urlnormalize(page.abshref(elem_tree.attrib['src']))
if page.abshref(elem_tree.attrib['src']) not in self.image_hrefs.keys(): if ihref in self.oeb_book.manifest.hrefs:
self.image_hrefs[page.abshref(elem_tree.attrib['src'])] = '_%s.jpg' % len(self.image_hrefs.keys()) if ihref not in self.image_hrefs:
self.image_hrefs[ihref] = '_%s.jpg' % len(self.image_hrefs)
p_txt, p_tag = self.ensure_p() p_txt, p_tag = self.ensure_p()
fb2_out += p_txt fb2_out += p_txt
tags += p_tag tags += p_tag
fb2_out.append('<image xlink:href="#%s" />' % self.image_hrefs[page.abshref(elem_tree.attrib['src'])]) fb2_out.append('<image xlink:href="#%s" />' % self.image_hrefs[ihref])
else:
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

10
src/calibre/gui2/metadata/diff.py Normal file
View File

@ -0,0 +1,10 @@
#!/usr/bin/env python
# vim:fileencoding=utf-8
from __future__ import (unicode_literals, division, absolute_import,
print_function)
__license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'