Fixes after testrun

Code cosmetics

cps/admin.py

@@ -499,7 +499,7 @@ def edit_list_user(param):
                 else:
                     return _("Parameter not found"), 400
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             return str(ex), 400
     ub.session_commit()
     return ""

cps/templates/listenmp3.html

@@ -134,7 +134,7 @@
         filePath: "{{ url_for('static', filename='js/libs/') }}",
         cssPath: "{{ url_for('static', filename='css/') }}",
         bookUrl: "{{ url_for('static', filename=mp3file) }}/",
-        bookmarkUrl: "{{ url_for('web.bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
+        bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
         bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
         useBookmarks: "{{ g.user.is_authenticated | tojson }}"
             };

cps/templates/read.html

@@ -86,7 +86,7 @@ <h3>{{_('Settings')}}</h3>
           window.calibre = {
               filePath: "{{ url_for('static', filename='js/libs/') }}",
               cssPath: "{{ url_for('static', filename='css/') }}",
-              bookmarkUrl: "{{ url_for('web.bookmark', book_id=bookid, book_format='EPUB') }}",
+              bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
               bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
               bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"

cps/web.py

@@ -26,6 +26,7 @@
 import mimetypes
 import chardet  # dependency of requests
 import copy
+from functools import wraps
 
 from babel.dates import format_date
 from babel import Locale as LC
@@ -59,6 +60,7 @@
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
 
+
 feature_support = {
     'ldap': bool(services.ldap),
     'goodreads': bool(services.goodreads_support),
@@ -72,11 +74,6 @@
     feature_support['oauth'] = False
     oauth_check = {}
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
 try:
     from natsort import natsorted as sort
 except ImportError:
@@ -134,7 +131,7 @@ def get_email_status_json():
 
 @web.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
 @login_required
-def bookmark(book_id, book_format):
+def set_bookmark(book_id, book_format):
     bookmark_key = request.form["bookmark"]
     ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
                                               ub.Bookmark.book_id == book_id,
@@ -642,7 +639,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))
-            # ToDo: Handle error Case for opds
+            return [] # ToDo: Handle error Case for opds
+
     if as_xml:
         return entries, pagination
     else:
@@ -809,6 +807,7 @@ def list_books():
                                     and_(ub.ReadBook.user_id == int(current_user.id),
                                          ub.ReadBook.book_id == db.Books.id)))
             else:
+                read_column = ""
                 try:
                     read_column = db.cc_classes[config.config_read_column]
                     books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
@@ -1725,12 +1724,14 @@ def profile():
 @viewer_required
 def read_book(book_id, book_format):
     book = calibre_db.get_filtered_book(book_id)
+    book.ordered_authors = calibre_db.order_authors([book], False)
+
     if not book:
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         return redirect(url_for("web.index"))
 
-    # check if book has bookmark
+    # check if book has a bookmark
     bookmark = None
     if current_user.is_authenticated:
         bookmark = ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),