|
|
|
@ -25,6 +25,7 @@ import zipfile
|
|
|
|
from werkzeug.security import generate_password_hash, check_password_hash
|
|
|
|
from werkzeug.security import generate_password_hash, check_password_hash
|
|
|
|
from babel import Locale as LC
|
|
|
|
from babel import Locale as LC
|
|
|
|
from babel import negotiate_locale
|
|
|
|
from babel import negotiate_locale
|
|
|
|
|
|
|
|
from babel.dates import format_date
|
|
|
|
from functools import wraps
|
|
|
|
from functools import wraps
|
|
|
|
import base64
|
|
|
|
import base64
|
|
|
|
from sqlalchemy.sql import *
|
|
|
|
from sqlalchemy.sql import *
|
|
|
|
@ -280,6 +281,12 @@ def mimetype_filter(val):
|
|
|
|
s = 'application/octet-stream'
|
|
|
|
s = 'application/octet-stream'
|
|
|
|
return s
|
|
|
|
return s
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@app.template_filter('formatdate')
|
|
|
|
|
|
|
|
def formatdate(val):
|
|
|
|
|
|
|
|
conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
|
|
|
|
|
|
|
|
formatdate = datetime.datetime.strptime(conformed_timestamp[:-5], "%Y%m%d %H%M%S")
|
|
|
|
|
|
|
|
return format_date(formatdate, format='medium',locale=get_locale())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def admin_required(f):
|
|
|
|
def admin_required(f):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
@ -659,10 +666,9 @@ def get_opds_download_link(book_id, format):
|
|
|
|
data = db.session.query(db.Data).filter(db.Data.book == book.id).filter(db.Data.format == format.upper()).first()
|
|
|
|
data = db.session.query(db.Data).filter(db.Data.book == book.id).filter(db.Data.format == format.upper()).first()
|
|
|
|
if current_user.is_authenticated:
|
|
|
|
if current_user.is_authenticated:
|
|
|
|
helper.update_download(book_id, int(current_user.id))
|
|
|
|
helper.update_download(book_id, int(current_user.id))
|
|
|
|
author = helper.get_normalized_author(book.author_sort)
|
|
|
|
|
|
|
|
file_name = book.title
|
|
|
|
file_name = book.title
|
|
|
|
if len(author) > 0:
|
|
|
|
if len(book.authors) > 0:
|
|
|
|
file_name = author + '-' + file_name
|
|
|
|
file_name = book.authors[0].name + '-' + file_name
|
|
|
|
file_name = helper.get_valid_filename(file_name)
|
|
|
|
file_name = helper.get_valid_filename(file_name)
|
|
|
|
response = make_response(send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
|
|
|
|
response = make_response(send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
|
|
|
|
response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (data.name, format)
|
|
|
|
response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (data.name, format)
|
|
|
|
@ -1229,10 +1235,9 @@ def get_download_link(book_id, format):
|
|
|
|
# collect downloaded books only for registered user and not for anonymous user
|
|
|
|
# collect downloaded books only for registered user and not for anonymous user
|
|
|
|
if current_user.is_authenticated:
|
|
|
|
if current_user.is_authenticated:
|
|
|
|
helper.update_download(book_id, int(current_user.id))
|
|
|
|
helper.update_download(book_id, int(current_user.id))
|
|
|
|
author = helper.get_normalized_author(book.author_sort)
|
|
|
|
|
|
|
|
file_name = book.title
|
|
|
|
file_name = book.title
|
|
|
|
if len(author) > 0:
|
|
|
|
if len(book.authors) > 0:
|
|
|
|
file_name = author + '-' + file_name
|
|
|
|
file_name = book.authors[0].name + '-' + file_name
|
|
|
|
file_name = helper.get_valid_filename(file_name)
|
|
|
|
file_name = helper.get_valid_filename(file_name)
|
|
|
|
response = make_response(
|
|
|
|
response = make_response(
|
|
|
|
send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
|
|
|
|
send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
|
|
|
|
@ -1240,13 +1245,7 @@ def get_download_link(book_id, format):
|
|
|
|
response.headers["Content-Type"] = mimetypes.types_map['.' + format]
|
|
|
|
response.headers["Content-Type"] = mimetypes.types_map['.' + format]
|
|
|
|
except:
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
response.headers["Content-Disposition"] = \
|
|
|
|
response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (file_name.encode('utf-8'), format)
|
|
|
|
"attachment; " \
|
|
|
|
|
|
|
|
"filename={utf_filename}.{suffix};" \
|
|
|
|
|
|
|
|
"filename*=UTF-8''{utf_filename}.{suffix}".format(
|
|
|
|
|
|
|
|
utf_filename=file_name.encode('utf-8'),
|
|
|
|
|
|
|
|
suffix=format
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return response
|
|
|
|
return response
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
abort(404)
|
|
|
|
abort(404)
|
|
|
|
@ -1579,9 +1578,10 @@ def profile():
|
|
|
|
@login_required
|
|
|
|
@login_required
|
|
|
|
@admin_required
|
|
|
|
@admin_required
|
|
|
|
def admin():
|
|
|
|
def admin():
|
|
|
|
|
|
|
|
commit = '$Format:%cI$'
|
|
|
|
content = ub.session.query(ub.User).all()
|
|
|
|
content = ub.session.query(ub.User).all()
|
|
|
|
settings = ub.session.query(ub.Settings).first()
|
|
|
|
settings = ub.session.query(ub.Settings).first()
|
|
|
|
return render_title_template("admin.html", content=content, email=settings, config=config,
|
|
|
|
return render_title_template("admin.html", content=content, email=settings, config=config, commit=commit,
|
|
|
|
development=ub.DEVELOPMENT, title=_(u"Admin page"))
|
|
|
|
development=ub.DEVELOPMENT, title=_(u"Admin page"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1669,7 +1669,7 @@ def configuration_helper(origin):
|
|
|
|
return render_title_template("config_edit.html", content=config, origin=origin,
|
|
|
|
return render_title_template("config_edit.html", content=config, origin=origin,
|
|
|
|
title=_(u"Basic Configuration"))
|
|
|
|
title=_(u"Basic Configuration"))
|
|
|
|
if reboot_required:
|
|
|
|
if reboot_required:
|
|
|
|
# db.engine.dispose() # ToDo verify correct
|
|
|
|
# db.engine.dispose() # ToDo verify correct
|
|
|
|
ub.session.close()
|
|
|
|
ub.session.close()
|
|
|
|
ub.engine.dispose()
|
|
|
|
ub.engine.dispose()
|
|
|
|
# stop tornado server
|
|
|
|
# stop tornado server
|
|
|
|
@ -1928,7 +1928,7 @@ def edit_book(book_id):
|
|
|
|
modify_database_object(input_authors, book.authors, db.Authors, db.session, 'author')
|
|
|
|
modify_database_object(input_authors, book.authors, db.Authors, db.session, 'author')
|
|
|
|
if author0_before_edit != book.authors[0].name:
|
|
|
|
if author0_before_edit != book.authors[0].name:
|
|
|
|
edited_books_id.add(book.id)
|
|
|
|
edited_books_id.add(book.id)
|
|
|
|
book.author_sort=helper.get_normalized_author(input_authors[0]) # ToDo: wrong sorting
|
|
|
|
book.author_sort=helper.get_sorted_author(input_authors[0])
|
|
|
|
|
|
|
|
|
|
|
|
if to_save["cover_url"] and os.path.splitext(to_save["cover_url"])[1].lower() == ".jpg":
|
|
|
|
if to_save["cover_url"] and os.path.splitext(to_save["cover_url"])[1].lower() == ".jpg":
|
|
|
|
img = requests.get(to_save["cover_url"])
|
|
|
|
img = requests.get(to_save["cover_url"])
|
|
|
|
@ -2168,9 +2168,10 @@ def upload():
|
|
|
|
if is_author:
|
|
|
|
if is_author:
|
|
|
|
db_author = is_author
|
|
|
|
db_author = is_author
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
db_author = db.Authors(author, helper.get_normalized_author(author), "") # TODO: WRONG Sorting Author function
|
|
|
|
db_author = db.Authors(author, helper.get_sorted_author(author), "")
|
|
|
|
db.session.add(db_author)
|
|
|
|
db.session.add(db_author)
|
|
|
|
path = os.path.join(author_dir, title_dir)
|
|
|
|
# combine path and normalize path from windows systems
|
|
|
|
|
|
|
|
path = os.path.join(author_dir, title_dir).replace('\\','/')
|
|
|
|
db_book = db.Books(title, "", db_author.sort, datetime.datetime.now(), datetime.datetime(101, 01, 01), 1,
|
|
|
|
db_book = db.Books(title, "", db_author.sort, datetime.datetime.now(), datetime.datetime(101, 01, 01), 1,
|
|
|
|
datetime.datetime.now(), path, has_cover, db_author, [])
|
|
|
|
datetime.datetime.now(), path, has_cover, db_author, [])
|
|
|
|
db_book.authors.append(db_author)
|
|
|
|
db_book.authors.append(db_author)
|
|
|
|
|
idalin
8 years ago