Merge remote-tracking branch 'kepubify/Develop' into Develop

# Conflicts: # cps/admin.py # cps/helper.py # cps/templates/config_edit.html # cps/web.py
2020-05-08 14:53:21 +02:00
parent 4e940f7fa0 38a255e069
commit a437c603c6
5 changed files with 41 additions and 5 deletions
@@ -1233,7 +1233,11 @@ def serve_book(book_id, book_format, anyname):
@login_required_if_no_ano
@download_required
 def download_link(book_id, book_format, anyname):
-    return get_download_link(book_id, book_format.lower())
+    if (config.config_automatic_kepub and
+        "Kobo" in request.headers.get('User-Agent')):
+        client = "kobo"
+
+    return get_download_link(book_id, book_format, client)


@web.route('/send/<int:book_id>/<book_format>/<int:convert>')