NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When upload pub, add description to comment accord opf file

Browse Source
This commit is contained in:
林檎 2017-03-03 12:46:19 +08:00
parent d5e525305d
commit 1a10859a57
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/book_formats.py
View File

@ -64,6 +64,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
tags="", tags="",
series="", series="",
series_id="", series_id="",
comments="",
languages="") languages="")
@ -93,6 +94,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
tags="", tags="",
series="", series="",
series_id="", series_id="",
comments="",
languages="") languages="")

10
cps/epub.py
View File

@ -41,6 +41,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0] p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
epub_metadata = {} epub_metadata = {}
try:#maybe description isn't present
comments = tree.xpath("//*[local-name() = 'description']/text()")[0]
epub_metadata['comments'] = comments
except:
epub_metadata['comments'] = ""
for s in ['title', 'description', 'creator']: for s in ['title', 'description', 'creator']:
tmp = p.xpath('dc:%s/text()' % s, namespaces=ns) tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
if len(tmp) > 0: if len(tmp) > 0:
@ -62,6 +68,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
epub_metadata['languages'] = "" epub_metadata['languages'] = ""
coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns) coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
coverfile = None
if len(coversection) > 0: if len(coversection) > 0:
coverfile = extractCover(zip, coversection[0], coverpath, tmp_file_path) coverfile = extractCover(zip, coversection[0], coverpath, tmp_file_path)
else: else:
@ -84,8 +91,6 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
meta_cover_content = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns) meta_cover_content = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
if len(meta_cover_content) > 0: if len(meta_cover_content) > 0:
coverfile = extractCover(zip, meta_cover_content[0], coverpath, tmp_file_path) coverfile = extractCover(zip, meta_cover_content[0], coverpath, tmp_file_path)
else:
coverfile = None
if epub_metadata['title'] is None: if epub_metadata['title'] is None:
title = original_file_name title = original_file_name
@ -102,4 +107,5 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
tags="", tags="",
series="", series="",
series_id="", series_id="",
comments=epub_metadata['comments'],
languages=epub_metadata['languages']) languages=epub_metadata['languages'])

2
cps/uploader.py
View File

@ -7,7 +7,7 @@ import hashlib
from collections import namedtuple from collections import namedtuple
import book_formats import book_formats
BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, series_id, languages') BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, series_id, comments, languages')
""" """
:rtype: BookMeta :rtype: BookMeta

9
cps/web.py
View File

@ -5,7 +5,7 @@ import logging
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
import textwrap import textwrap
from flask import Flask, render_template, request, Response, redirect, url_for, send_from_directory, \ from flask import Flask, render_template, request, Response, redirect, url_for, send_from_directory, \
make_response, g, flash, abort make_response, g, flash, abort, Markup
from flask import __version__ as flaskVersion from flask import __version__ as flaskVersion
import ub import ub
from ub import config from ub import config
@ -2232,6 +2232,13 @@ def upload():
db_book.data.append(db_data) db_book.data.append(db_data)
db.session.add(db_book) db.session.add(db_book)
db.session.flush()# flush content get db_book.id avalible
#add comment
upload_comment = Markup(meta.comments).unescape()
db_comment = None
if upload_comment != "":
db_comment = db.Comments(upload_comment, db_book.id)
db.session.add(db_comment)
db.session.commit() db.session.commit()
if db_language is not None: #display Full name instead of iso639.part3 if db_language is not None: #display Full name instead of iso639.part3
db_book.languages[0].language_name = meta.languages db_book.languages[0].language_name = meta.languages