mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-27 13:28:04 +00:00
Code Issues Releases Wiki Activity

Fix #568 (encoding problem in fb2 upload)

Browse Source
This commit is contained in:
Ozzie Isaacs
2018-08-04 17:08:32 +02:00
parent 82fe282e9b
commit f81fbaf542
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cps/fb2.py
View File

@@ -20,41 +20,43 @@ def get_fb2_info(tmp_file_path, original_file_extension):
def get_author(element):
last_name = element.xpath('fb:last-name/text()', namespaces=ns)
if len(last_name):
last_name = last_name[0]
last_name = last_name[0].encode('utf-8')
else:
last_name = u''
middle_name = element.xpath('fb:middle-name/text()', namespaces=ns)
if len(middle_name):
middle_name = middle_name[0]
middle_name = middle_name[0].encode('utf-8')
else:
middle_name = u''
first_name = element.xpath('fb:first-name/text()', namespaces=ns)
if len(first_name):
first_name = first_name[0]
first_name = first_name[0].encode('utf-8')
else:
first_name = u''
return first_name + ' ' + middle_name + ' ' + last_name
return (first_name.decode('utf-8') + u' '
+ middle_name.decode('utf-8') + u' '
+ last_name.decode('utf-8')).encode('utf-8')
author = str(", ".join(map(get_author, authors)))
title = tree.xpath('/fb:FictionBook/fb:description/fb:title-info/fb:book-title/text()', namespaces=ns)
if len(title):
title = str(title[0])
title = str(title[0].encode('utf-8'))
else:
title = u''
description = tree.xpath('/fb:FictionBook/fb:description/fb:publish-info/fb:book-name/text()', namespaces=ns)
if len(description):
description = str(description[0])
description = str(description[0].encode('utf-8'))
else:
description = u''
return uploader.BookMeta(
file_path=tmp_file_path,
extension=original_file_extension,
title=title.encode('utf-8').decode('utf-8'),
author=author.encode('utf-8').decode('utf-8'),
title=title.decode('utf-8'),
author=author.decode('utf-8'),
cover=None,
description=description,
description=description.decode('utf-8'),
tags="",
series="",
series_id="",