Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 10:54:53 +02:00
Code Issues Projects Releases Wiki Activity

Fix cover detection in FB2.1 fb2 files

Browse source
This commit is contained in:
Kovid Goyal 2014-12-14 12:19:39 +05:30
parent 610f2e32cb
commit 2c9ca9ea7e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/calibre/ebooks/conversion/plugins/fb2_input.py
View file

@ -9,8 +9,8 @@
from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
from calibre import guess_type
FB2NS = 'http://www.gribuser.ru/xml/fictionbook/2.0'
FB2NS = 'http://www.gribuser.ru/xml/fictionbook/2.0'
FB21NS = 'http://www.gribuser.ru/xml/fictionbook/2.1'
class FB2Input(InputFormatPlugin):
@ -40,7 +40,6 @@ def convert(self, stream, options, file_ext, log,
from calibre.ebooks.metadata.meta import get_metadata
from calibre.ebooks.oeb.base import XLINK_NS, XHTML_NS, RECOVER_PARSER
from calibre.ebooks.chardet import xml_to_unicode
NAMESPACES = {'f':FB2NS, 'l':XLINK_NS}
self.log = log
log.debug('Parsing XML...')
raw = stream.read().replace('\0', '')
@ -61,7 +60,8 @@ def convert(self, stream, options, file_ext, log,
try:
fb_ns = doc.nsmap[doc.prefix]
except Exception:
fb_ns = 'http://www.gribuser.ru/xml/fictionbook/2.0'
fb_ns = FB2NS
NAMESPACES = {'f':fb_ns, 'l':XLINK_NS}
stylesheets = doc.xpath('//*[local-name() = "stylesheet" and @type="text/css"]')
css = ''
for s in stylesheets: