@ -25,6 +25,7 @@ import zipfile
from werkzeug . security import generate_password_hash , check_password_hash
from babel import Locale as LC
from babel import negotiate_locale
from babel . dates import format_date
from functools import wraps
import base64
from sqlalchemy . sql import *
@ -279,6 +280,12 @@ def mimetype_filter(val):
s = ' application/octet-stream '
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 ) :
"""
@ -658,10 +665,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 ( )
if current_user . is_authenticated :
helper . update_download ( book_id , int ( current_user . id ) )
author = helper . get_normalized_author ( book . author_sort )
file_name = book . title
if len ( ) > 0 :
file_name = + ' - ' + file_name
if len ( book. authors ) > 0 :
file_name = book. authors[ 0 ] . name + ' - ' + 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 . headers [ " Content-Disposition " ] = " attachment; filename= \" %s . %s \" " % ( data . name , format )
@ -1228,10 +1234,9 @@ def get_download_link(book_id, format):
# collect downloaded books only for registered user and not for anonymous user
if current_user . is_authenticated :
helper . update_download ( book_id , int ( current_user . id ) )
author = helper . get_normalized_author ( book . author_sort )
file_name = book . title
if len ( ) > 0 :
file_name = + ' - ' + file_name
if len ( book. authors ) > 0 :
file_name = book. authors[ 0 ] . name + ' - ' + 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 ) )
@ -1239,13 +1244,7 @@ def get_download_link(book_id, format):
response . headers [ " Content-Type " ] = mimetypes . types_map [ ' . ' + format ]
except :
pass
response . headers [ " Content-Disposition " ] = \
" attachment; " \
" filename= {utf_filename} . {suffix} ; " \
" filename*=UTF-8 ' ' {utf_filename} . {suffix} " . format (
utf_filename = file_name . encode ( ' utf-8 ' ) ,
suffix = format
)
response . headers [ " Content-Disposition " ] = " attachment; filename= \" %s . %s \" " % ( file_name . encode ( ' utf-8 ' ) , format )
return response
else :
abort ( 404 )
@ -1599,6 +1598,7 @@ def basic_configuration():
def configuration_helper ( origin ) :
global global_task
commit = ' $Format: %c I$ '
reboot_required = False
db_change = False
success = False
@ -1659,13 +1659,13 @@ def configuration_helper(origin):
logging . getLogger ( " book_formats " ) . setLevel ( config . config_log_level )
except e :
flash ( e , category = " error " )
return render_title_template ( " config_edit.html " , content = config , origin = origin ,
return render_title_template ( " config_edit.html " , content = config , origin = origin , commit = commit ,
title = _ ( u " Basic Configuration " ) )
if db_change :
reload ( db )
if not db . setup_db ( ) :
flash ( _ ( u ' DB location is not valid, please enter correct path ' ) , category = " error " )
return render_title_template ( " config_edit.html " , content = config , origin = origin ,
return render_title_template ( " config_edit.html " , content = config , origin = origin , commit = commit ,
title = _ ( u " Basic Configuration " ) )
if reboot_required :
# db.engine.dispose() # ToDo verify correct
@ -1678,7 +1678,7 @@ def configuration_helper(origin):
app . logger . info ( ' Reboot required, restarting ' )
if origin :
success = True
return render_title_template ( " config_edit.html " , origin = origin , success = success , content = config ,
return render_title_template ( " config_edit.html " , origin = origin , success = success , content = config , commit = commit ,
title = _ ( u " Basic Configuration " ) )
@ -1927,7 +1927,7 @@ def edit_book(book_id):
modify_database_object ( input_authors , book . authors , db . Authors , db . session , ' author ' )
if author0_before_edit != book . authors [ 0 ] . name :
edited_books_id . add ( book . id )
book . author_sort = helper . get_ normaliz ed_author( input_authors [ 0 ] ) # ToDo: wrong sorting
book . author_sort = helper . get_ sort ed_author( input_authors [ 0 ] )
if to_save [ " cover_url " ] and os . path . splitext ( to_save [ " cover_url " ] ) [ 1 ] . lower ( ) == " .jpg " :
img = requests . get ( to_save [ " cover_url " ] )
@ -2155,9 +2155,10 @@ def upload():
if is_author :
db_author = is_author
else :
db_author = db . Authors ( author , helper . get_ normaliz ed_author( author ) , " " ) # TODO: WRONG Sorting Author function
db_author = db . Authors ( author , helper . get_ sort ed_author( 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 ,
datetime . datetime . now ( ) , path , has_cover , db_author , [ ] )
db_book . authors . append ( db_author )
OzzieIsaacs
8 years ago