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: Remove empty lines from header

Browse Source
This commit is contained in:
Andrey Efremov 2019-10-07 12:22:07 +07:00
parent 906b8773c5
commit 62757eadff
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ from calibre.constants import __appname__, __version__
from calibre.utils.localization import lang_as_iso639_1 from calibre.utils.localization import lang_as_iso639_1
from calibre.utils.img import save_cover_data_to from calibre.utils.img import save_cover_data_to
from calibre.ebooks.oeb.base import urlnormalize from calibre.ebooks.oeb.base import urlnormalize
from polyglot.builtins import unicode_type, string_or_bytes, range from polyglot.builtins import unicode_type, string_or_bytes, range, filter
from polyglot.binary import as_base64_unicode from polyglot.binary import as_base64_unicode
@ -195,12 +195,12 @@ class FB2MLizer(object):
from calibre.utils.html2text import html2text from calibre.utils.html2text import html2text
metadata['comments'] = '<annotation>{}</annotation>'.format(prepare_string_for_xml(html2text(comments.value.strip()))) metadata['comments'] = '<annotation>{}</annotation>'.format(prepare_string_for_xml(html2text(comments.value.strip())))
return textwrap.dedent(''' header = textwrap.dedent('''\
<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"> <FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">
<description> <description>
<title-info> <title-info>
<genre>%(genre)s</genre> <genre>%(genre)s</genre>
%(author)s %(author)s
<book-title>%(title)s</book-title> <book-title>%(title)s</book-title>
%(cover)s %(cover)s
<lang>%(lang)s</lang> <lang>%(lang)s</lang>
@ -220,7 +220,10 @@ class FB2MLizer(object):
%(year)s %(year)s
%(isbn)s %(isbn)s
</publish-info> </publish-info>
</description>\n''') % metadata </description>''') % metadata
# Remove empty lines.
return '\n'.join(filter(unicode_type.strip, header.splitlines())) + '\n'
def fb2_footer(self): def fb2_footer(self):
return '</FictionBook>' return '</FictionBook>'