mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-17 23:34:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into travis

Browse Source 
# Conflicts:
#	cps/helper.py
#	cps/web.py
This commit is contained in:
林檎 2017-03-07 13:33:27 +08:00
commit 7a14101d6f
3 changed files with 15458 additions and 23165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cps/translations/pl/LC_MESSAGES/messages.mo
View File

Binary file not shown.

38615
cps/translations/pl/LC_MESSAGES/messages.po
View File

File diff suppressed because it is too large Load Diff

4
cps/web.py
View File

@ -685,7 +685,7 @@ def get_opds_download_link(book_id, format):
file_name = book.authors[0].name + '-' + 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\"" % (quote(file_name.encode('utf8')), format) response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (urllib.quote(file_name.encode('utf8')), format)
return response return response
@ -1295,7 +1295,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 Exception as e: except Exception as e:
pass pass
response.headers["Content-Disposition"] = "attachment; filename=\"%s.%s\"" % (quote(file_name.encode('utf-8')), format) response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (urllib.quote(file_name.encode('utf-8')), format)
return response return response
else: else:
abort(404) abort(404)