1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-28 22:07:41 +00:00

- added best rated section in normal view

- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
This commit is contained in:
OzzieIsaacs
2017-02-04 14:28:18 +01:00
parent ee91fc03ef
commit 241c4cef8f
10 changed files with 116 additions and 2512 deletions

View File

@@ -4,9 +4,10 @@
from lxml import etree
import os
import uploader
import StringIO
# ToDo: Check usage of original_file_name
def get_fb2_info(tmp_file_path, original_file_name, original_file_extension):
def get_fb2_info(tmp_file_path, original_file_extension):
ns = {
'fb': 'http://www.gribuser.ru/xml/fictionbook/2.0',
@@ -19,19 +20,43 @@ def get_fb2_info(tmp_file_path, original_file_name, original_file_extension):
authors = tree.xpath('/fb:FictionBook/fb:description/fb:title-info/fb:author', namespaces=ns)
def get_author(element):
return element.xpath('fb:first-name/text()', namespaces=ns)[0] + ' ' + element.xpath('fb:middle-name/text()',
namespaces=ns)[0] + ' ' + element.xpath('fb:last-name/text()', namespaces=ns)[0]
author = ", ".join(map(get_author, authors))
last_name=element.xpath('fb:last-name/text()', namespaces=ns)
if len(last_name):
last_name=last_name[0]
else:
last_name=u''
middle_name=element.xpath('fb:middle-name/text()', namespaces=ns)
if len(middle_name):
middle_name=middle_name[0]
else:
middle_name=u''
first_name=element.xpath('fb:first-name/text()', namespaces=ns)
if len(first_name):
first_name=first_name[0]
else:
first_name=u''
return first_name + ' ' + middle_name + ' ' + last_name
author = unicode(", ".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=unicode(title[0])
else:
title=u''
description = tree.xpath('/fb:FictionBook/fb:description/fb:publish-info/fb:book-name/text()', namespaces=ns)
if len(description):
description=unicode(description[0])
else:
description=u''
title = unicode(tree.xpath('/fb:FictionBook/fb:description/fb:title-info/fb:book-title/text()', namespaces=ns)[0])
description = unicode(tree.xpath('/fb:FictionBook/fb:description/fb:publish-info/fb:book-name/text()',
namespaces=ns)[0])
return uploader.BookMeta(
file_path=tmp_file_path,
extension=original_file_extension,
title=title,
author=author,
title=title.encode('utf-8').decode('utf-8'),
author=author.encode('utf-8').decode('utf-8'),
cover=None,
description=description,
tags="",