From 147947662ca606f26a3ae0a05e61e5e5de4fcf11 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 17 Jun 2019 23:46:38 +0200
Subject: [PATCH 01/38] Base64

---
 cps/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/admin.py b/cps/admin.py
index f6fd838f..0f553035 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -25,6 +25,7 @@ from __future__ import division, print_function, unicode_literals
 import os
 import json
 import time
+import base64
 from datetime import datetime, timedelta
 try:
     from imp import reload

From 3d0beba26172489e68c9cdd9a53ca1d3c6000b0e Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 17 Jun 2019 23:47:35 +0200
Subject: [PATCH 02/38] Base64

---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index 0f553035..c641f3a0 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -25,7 +25,7 @@ from __future__ import division, print_function, unicode_literals
 import os
 import json
 import time
-import base64
+import base64 
 from datetime import datetime, timedelta
 try:
     from imp import reload

From e5b9da5201d7ed1e597e2a8884fbd5f59b0ffb4b Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 1 Jul 2019 21:44:58 +0200
Subject: [PATCH 03/38] Error management

---
 cps/web.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 3f8964d4..1ae1aa86 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1098,19 +1098,15 @@ def login():
                     flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname),
                           category="success")
                     return redirect_back(url_for("web.index"))
-            except ldap.ldap.INVALID_CREDENTIALS as e:
-                log.error('Login Error: ' + str(e))
-                ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
-                log.info('LDAP Login failed for user "%s" IP-adress: %s', form['username'], ipAdress)
-                flash(_(u"Wrong Username or Password"), category="error")
-            except ldap.ldap.SERVER_DOWN:
-                log.info('LDAP Login failed, LDAP Server down')
-                flash(_(u"Could not login. LDAP server down, please contact your administrator"), category="error")
-            '''except LDAPException as exception:
-                app.logger.error('Login Error: ' + str(exception))
-                ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
-                app.logger.info('LDAP Login failed for user "' + form['username'] + ', IP-address :' + ipAdress)
-                flash(_(u"Wrong Username or Password"), category="error")'''
+            except Exception as exception:
+                app.logger.info('Login Error: ' + str(exception))
+                if str(exception) == 'Invalid credentials':
+                    ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
+                    app.logger.info('LDAP Login failed for user "' + form['username'] + ', IP-address :' + ipAdress)
+                    flash(_(u"Wrong Username or Password"), category="error")
+                if str(exception) == 'Server down':
+                    log.info('LDAP Login failed, LDAP Server down')
+                    flash(_(u"Could not login. LDAP server down, please contact your administrator"), category="error")
         else:
             if user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest":
                 login_user(user, remember=True)

From 00a29f3d8840e285cc17e6d929d7616715612110 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Mon, 1 Jul 2019 21:45:35 +0200
Subject: [PATCH 04/38] Check for change before encoding

---
 cps/admin.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index c641f3a0..9c08d2d4 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -413,12 +413,13 @@ def configuration_helper(origin):
                                              goodreads=goodreads_support, title=_(u"Basic Configuration"),
                                              page="config")
             else:
-                content.config_use_ldap = 1
+                content.config_login_type = 1
                 content.config_ldap_provider_url = to_save["config_ldap_provider_url"]
                 content.config_ldap_port = to_save["config_ldap_port"]
                 content.config_ldap_schema = to_save["config_ldap_schema"]
                 content.config_ldap_serv_username = to_save["config_ldap_serv_username"]
-                content.config_ldap_serv_password = base64.b64encode(to_save["config_ldap_serv_password"])
+                if content.config_ldap_serv_password != to_save["config_ldap_serv_password"]:
+                    content.config_ldap_serv_password = base64.b64encode(to_save["config_ldap_serv_password"])
                 content.config_ldap_dn = to_save["config_ldap_dn"]
                 content.config_ldap_user_object = to_save["config_ldap_user_object"]
                 reboot_required = True

From 9b119fa7243efa46fa7e474eadb1f4d83dc5d089 Mon Sep 17 00:00:00 2001
From: Simon Latapie <garf1242@gmail.com>
Date: Sun, 12 Jan 2020 23:23:43 +0100
Subject: [PATCH 05/38] edit book: manage identifiers

---
 cps/editbooks.py             | 37 ++++++++++++++++++++++++++++++++++++
 cps/templates/book_edit.html | 30 +++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 0bb005fb..261b70ba 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -147,6 +147,26 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
                 db_book_object.append(db_element)
 
 
+def modify_identifiers(input_identifiers, db_identifiers, db_session):
+    """Modify Identifiers to match input information.
+       input_identifiers is a list of read-to-persist Identifiers objects.
+       db_identifiers is a list of already persisted list of Identifiers objects."""
+    input_dict = dict([ (identifier.type.lower(), identifier) for identifier in input_identifiers ])
+    db_dict = dict([ (identifier.type.lower(), identifier) for identifier in db_identifiers ])
+    # delete db identifiers not present in input or modify them with input val
+    for identifier_type, identifier in db_dict.items():
+        if identifier_type not in input_dict.keys():
+            db_session.delete(identifier)
+        else:
+            input_identifier = input_dict[identifier_type]
+            identifier.type = input_identifier.type
+            identifier.val = input_identifier.val
+    # add input identifiers not present in db
+    for identifier_type, identifier in input_dict.items():
+        if identifier_type not in db_dict.keys():
+            db_session.add(identifier)
+
+
 @editbook.route("/delete/<int:book_id>/", defaults={'book_format': ""})
 @editbook.route("/delete/<int:book_id>/<string:book_format>/")
 @login_required
@@ -459,6 +479,10 @@ def edit_book(book_id):
             else:
                 book.comments.append(db.Comments(text=to_save["description"], book=book.id))
 
+            # Handle identifiers
+            input_identifiers = identifier_list(to_save, book)
+            modify_identifiers(input_identifiers, book.identifiers, db.session)
+
             # Handle book tags
             input_tags = to_save["tags"].split(',')
             input_tags = list(map(lambda it: it.strip(), input_tags))
@@ -548,6 +572,19 @@ def merge_metadata(to_save, meta):
     to_save["description"] = to_save["description"] or Markup(
         getattr(meta, 'description', '')).unescape()
 
+def identifier_list(to_save, book):
+    """Generate a list of Identifiers from form information"""
+    id_type_prefix = 'identifier-type-'
+    id_val_prefix = 'identifier-val-'
+    result = []
+    for type_key, type_value in to_save.items():
+        if not type_key.startswith(id_type_prefix):
+            continue
+        val_key = id_val_prefix + type_key[len(id_type_prefix):]
+        if val_key not in to_save.keys():
+            continue
+        result.append( db.Identifiers(to_save[val_key], type_value, book.id) )
+    return result
 
 @editbook.route("/upload", methods=["GET", "POST"])
 @login_required_if_no_ano
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 78b427eb..19ac299b 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -61,6 +61,21 @@
       <label for="description">{{_('Description')}}</label>
       <textarea class="form-control" name="description" id="description" rows="7">{% if book.comments %}{{book.comments[0].text}}{%endif%}</textarea>
     </div>
+
+    <div class="form-group">
+      <label>{{_('Identifiers')}}</label>
+      <table class="table" id="identifier-table">
+	{% for identifier in book.identifiers %}
+	<tr>
+          <td><input type="text" class="form-control" name="identifier-type-{{identifier.type}}" value="{{identifier.type}}" required="required" placeholder="{{_('Identifier Type')}}"></td>
+	  <td><input type="text" class="form-control" name="identifier-val-{{identifier.type}}" value="{{identifier.val}}" required="required" placeholder="{{_('Identifier Value')}}"></td>
+	  <td><a class="btn btn-default" onclick="removeIdentifierLine(this)">{{_('Remove')}}</a></td>
+	</tr>
+	{% endfor %}
+      </table>
+      <a id="add-identifier-line" class="btn btn-default">{{_('Add Identifier')}}</a>
+    </div>
+
     <div class="form-group">
       <label for="tags">{{_('Tags')}}</label>
       <input type="text" class="form-control typeahead" name="tags" id="tags" value="{% for tag in book.tags %}{{tag.name.strip()}}{% if not loop.last %}, {% endif %}{% endfor %}">
@@ -274,6 +289,21 @@
     'source': {{_('Source')|safe|tojson}},
   };
   var language = '{{ g.user.locale }}';
+
+  $("#add-identifier-line").click(function() {
+    // create a random identifier type to have a valid name in form. This will not be used when dealing with the form
+    var rand_id = Math.floor(Math.random() * 1000000).toString();
+    var line = '<tr>';
+    line += '<td><input type="text" class="form-control" name="identifier-type-'+ rand_id +'" required="required" placeholder="{{_('Identifier Type')}}"></td>';
+    line += '<td><input type="text" class="form-control" name="identifier-val-'+ rand_id +'" required="required" placeholder="{{_('Identifier Value')}}"></td>';
+    line += '<td><a class="btn btn-default" onclick="removeIdentifierLine(this)">{{_('Remove')}}</a></td>';
+    line += '</tr>';
+    $("#identifier-table").append(line);
+  });
+  function removeIdentifierLine(el) {
+    $(el).parent().parent().remove();
+  } 
+
 </script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>

From e404da4192286eefba0ece168b478b2e1b7bbdb0 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Fri, 24 Jan 2020 00:04:16 -0500
Subject: [PATCH 06/38] Add support for book 'deletion' (i.e archiving) from a
 Kobo device.

---
 cps/kobo.py | 43 +++++++++++++++++++++++++++++++++++++++----
 cps/ub.py   | 11 +++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 7e1cbc8e..57ef1ab5 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -21,6 +21,7 @@ import sys
 import uuid
 from datetime import datetime
 from time import gmtime, strftime
+
 try:
     from urllib import unquote
 except ImportError:
@@ -35,12 +36,12 @@ from flask import (
     url_for,
     redirect,
 )
-from flask_login import login_required
+from flask_login import login_required, current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 import requests
 
-from . import config, logger, kobo_auth, db, helper
+from . import config, logger, kobo_auth, db, helper, ub
 from .services import SyncToken as SyncToken
 from .web import download_required
 
@@ -53,6 +54,7 @@ kobo_auth.register_url_value_preprocessor(kobo)
 
 log = logger.create()
 
+
 def get_store_url_for_current_request():
     # Programmatically modify the current url to point to the official Kobo store
     base, sep, request_path_with_auth_token = request.full_path.rpartition("/kobo/")
@@ -114,6 +116,14 @@ def HandleSyncRequest():
     # in case of external changes (e.g: adding a book through Calibre).
     db.reconnect_db(config)
 
+    archived_books = (
+        ub.session.query(ub.ArchivedBook)
+        .filter(ub.ArchivedBook.user_id == int(current_user.id))
+        .filter(ub.ArchivedBook.is_archived == True)
+        .all()
+    )
+    archived_book_ids = [archived_book.book_id for archived_book in archived_books]
+
     # sqlite gives unexpected results when performing the last_modified comparison without the datetime cast.
     # It looks like it's treating the db.Books.last_modified field as a string and may fail
     # the comparison because of the +00:00 suffix.
@@ -122,6 +132,7 @@ def HandleSyncRequest():
         .join(db.Data)
         .filter(func.datetime(db.Books.last_modified) != sync_token.books_last_modified)
         .filter(db.Data.format.in_(KOBO_FORMATS))
+        .filter(db.Books.id.notin_(archived_book_ids))
         .all()
     )
     for book in changed_entries:
@@ -342,13 +353,37 @@ def TopLevelEndpoint():
     return make_response(jsonify({}))
 
 
+@kobo.route("/v1/library/<book_uuid>", methods=["DELETE"])
+@login_required
+def HandleBookDeletionRequest(book_uuid):
+    log.info("Kobo book deletion request received for book %s" % book_uuid)
+    book = db.session.query(db.Books).filter(db.Books.uuid == book_uuid).first()
+    if not book:
+        log.info(u"Book %s not found in database", book_uuid)
+        return redirect_or_proxy_request()
+
+    book_id = book.id
+    archived_book = (
+        ub.session.query(ub.ArchivedBook)
+        .filter(ub.ArchivedBook.book_id == book_id)
+        .first()
+    )
+    if not archived_book:
+        archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
+        archived_book.book_id = book_id
+    archived_book.is_archived = True
+    ub.session.merge(archived_book)
+    ub.session.commit()
+
+    return ("", 204)
+
+
 # TODO: Implement the following routes
-@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
 @kobo.route("/v1/library/<book_uuid>/state", methods=["PUT"])
 @kobo.route("/v1/library/tags", methods=["POST"])
 @kobo.route("/v1/library/tags/<shelf_name>", methods=["POST"])
 @kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE"])
-def HandleUnimplementedRequest(dummy=None, book_uuid=None, shelf_name=None, tag_id=None):
+def HandleUnimplementedRequest(book_uuid=None, shelf_name=None, tag_id=None):
     return redirect_or_proxy_request()
 
 
diff --git a/cps/ub.py b/cps/ub.py
index 8564ef21..7ebd287c 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -300,6 +300,15 @@ class Bookmark(Base):
     format = Column(String(collation='NOCASE'))
     bookmark_key = Column(String)
 
+# Baseclass representing books that are archived on the user's Kobo device.
+class ArchivedBook(Base):
+    __tablename__ = 'archived_book'
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, ForeignKey('user.id'))
+    book_id = Column(Integer)
+    is_archived = Column(Boolean, unique=False)
+
 
 # Baseclass representing Downloads from calibre-web in app.db
 class Downloads(Base):
@@ -353,6 +362,8 @@ def migrate_Database(session):
         ReadBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "bookmark"):
         Bookmark.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "archived_book"):
+        ArchivedBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         ReadBook.__table__.create(bind=engine)
         conn = engine.connect()

From c0239a659c0426d66599e270bc0fa5cffcfe8b18 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sat, 25 Jan 2020 18:29:17 -0500
Subject: [PATCH 07/38] Add UI support for archived books.

Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
---
 cps/config_sql.py         |  2 +-
 cps/constants.py          |  3 +-
 cps/helper.py             | 26 +++++++++++++----
 cps/static/js/caliBlur.js | 24 ++++++++++++++++
 cps/static/js/details.js  |  8 ++++++
 cps/templates/detail.html |  8 ++++++
 cps/ub.py                 |  5 +++-
 cps/web.py                | 59 +++++++++++++++++++++++++++++++++++----
 8 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index a00b4217..97c05067 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -70,7 +70,7 @@ class _Settings(_Base):
     config_remote_login = Column(Boolean, default=False)
 
     config_default_role = Column(SmallInteger, default=0)
-    config_default_show = Column(SmallInteger, default=6143)
+    config_default_show = Column(SmallInteger, default=38911)
     config_columns_to_ignore = Column(String)
 
     config_restricted_tags = Column(String, default="")
diff --git a/cps/constants.py b/cps/constants.py
index a78c31b3..e0d56922 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -80,9 +80,10 @@ MATURE_CONTENT          = 1 << 11
 SIDEBAR_PUBLISHER       = 1 << 12
 SIDEBAR_RATING          = 1 << 13
 SIDEBAR_FORMAT          = 1 << 14
+SIDEBAR_ARCHIVED        = 1 << 15
 
 ADMIN_USER_ROLES        = sum(r for r in ALL_ROLES.values()) & ~ROLE_EDIT_SHELFS & ~ROLE_ANONYMOUS
-ADMIN_USER_SIDEBAR      = (SIDEBAR_FORMAT << 1) - 1
+ADMIN_USER_SIDEBAR      = (SIDEBAR_ARCHIVED << 1) - 1
 
 UPDATE_STABLE       = 0 << 0
 AUTO_UPDATE_STABLE  = 1 << 0
diff --git a/cps/helper.py b/cps/helper.py
index 93ce1b07..a1265f73 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -683,7 +683,19 @@ def render_task_status(tasklist):
 
 
 # Language and content filters for displaying in the UI
-def common_filters():
+def common_filters(allow_show_archived=False):
+    if not allow_show_archived:
+        archived_books = (
+            ub.session.query(ub.ArchivedBook)
+            .filter(ub.ArchivedBook.user_id == int(current_user.id))
+            .filter(ub.ArchivedBook.is_archived == True)
+            .all()
+        )
+        archived_book_ids = [archived_book.book_id for archived_book in archived_books]
+        archived_filter = db.Books.id.notin_(archived_book_ids)
+    else:
+        archived_filter = true()
+
     if current_user.filter_language() != "all":
         lang_filter = db.Books.languages.any(db.Languages.lang_code == current_user.filter_language())
     else:
@@ -708,7 +720,7 @@ def common_filters():
         pos_content_cc_filter = true()
         neg_content_cc_filter = false()
     return and_(lang_filter, pos_content_tags_filter, ~neg_content_tags_filter,
-                pos_content_cc_filter, ~neg_content_cc_filter)
+                pos_content_cc_filter, ~neg_content_cc_filter, archived_filter)
 
 
 def tags_filters():
@@ -765,15 +777,19 @@ def order_authors(entry):
 
 # Fill indexpage with all requested data from database
 def fill_indexpage(page, database, db_filter, order, *join):
+    return fill_indexpage_with_archived_books(page, database, db_filter, order, False, *join)
+
+
+def fill_indexpage_with_archived_books(page, database, db_filter, order, allow_show_archived, *join):
     if current_user.show_detail_random():
-        randm = db.session.query(db.Books).filter(common_filters())\
+        randm = db.session.query(db.Books).filter(common_filters(allow_show_archived))\
             .order_by(func.random()).limit(config.config_random_books)
     else:
         randm = false()
     off = int(int(config.config_books_per_page) * (page - 1))
     pagination = Pagination(page, config.config_books_per_page,
-                            len(db.session.query(database).filter(db_filter).filter(common_filters()).all()))
-    entries = db.session.query(database).join(*join, isouter=True).filter(db_filter).filter(common_filters()).\
+                            len(db.session.query(database).filter(db_filter).filter(common_filters(allow_show_archived)).all()))
+    entries = db.session.query(database).join(*join, isouter=True).filter(db_filter).filter(common_filters(allow_show_archived)).\
         order_by(*order).offset(off).limit(config.config_books_per_page).all()
     for book in entries:
         book = order_authors(book)
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 1bd5f69c..9313ee94 100644
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -216,6 +216,8 @@ if ( $( 'body.book' ).length > 0 ) {
     .prependTo( '[aria-label^="Download, send"]' );
   $( '#have_read_cb' )
     .after( '<label class="block-label readLbl" for="#have_read_cb"></label>' );
+  $( '#archived_cb' )
+    .after( '<label class="block-label readLbl" for="#archived_cb"></label>' );
   $( '#shelf-actions' ).prependTo( '[aria-label^="Download, send"]' );
 
 
@@ -586,6 +588,20 @@ $( '#have_read_cb:checked' ).attr({
   'data-viewport': '.btn-toolbar' })
   .addClass('readunread-btn-tooltip');
 
+  $( '#archived_cb' ).attr({
+    'data-toggle': 'tooltip',
+    'title': $( '#archived_cb').attr('data-unchecked'),
+    'data-placement': 'bottom',
+    'data-viewport': '.btn-toolbar' })
+    .addClass('readunread-btn-tooltip');
+
+  $( '#archived_cb:checked' ).attr({
+    'data-toggle': 'tooltip',
+    'title': $( '#archived_cb').attr('data-checked'),
+    'data-placement': 'bottom',
+    'data-viewport': '.btn-toolbar' })
+    .addClass('readunread-btn-tooltip');
+
   $( 'button#delete' ).attr({
     'data-toggle-two': 'tooltip',
     'title': $( 'button#delete' ).text(),           //'Delete'
@@ -601,6 +617,14 @@ $( '#have_read_cb' ).click(function() {
   }
 });
 
+$( '#archived_cb' ).click(function() {
+  if ( $( '#archived_cb:checked' ).length > 0 ) {
+      $( this ).attr('data-original-title', $('#archived_cb').attr('data-checked'));
+  } else {
+      $( this).attr('data-original-title', $('#archived_cb').attr('data-unchecked'));
+  }
+});
+
 $( '.btn-group[aria-label="Edit/Delete book"] a' ).attr({
    'data-toggle': 'tooltip',
    'title': $( '#edit_book' ).text(),               // 'Edit'
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 491d23bb..395518cb 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -25,6 +25,14 @@ $("#have_read_cb").on("change", function() {
     $(this).closest("form").submit();
 });
 
+$(function() {
+    $("#archived_form").ajaxForm();
+});
+
+$("#archived_cb").on("change", function() {
+    $(this).closest("form").submit();
+});
+
 (function() {
     var templates = {
         add: _.template(
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b76a8afa..214a0738 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -202,6 +202,14 @@
             </label>
           </form>
           </p>
+          <p>
+            <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id)}}" method="POST">
+              <label class="block-label">
+                <input id="archived_cb" data-checked="{{_('Restore from archive')}}" data-unchecked="{{_('Add to archive')}}" type="checkbox" {% if is_archived %}checked{% endif %} >
+                <span>{{_('Archived')}}</span>
+              </label>
+            </form>
+          </p>
         </div>
       {% endif %}
 
diff --git a/cps/ub.py b/cps/ub.py
index 7ebd287c..62ba82af 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -97,10 +97,13 @@ def get_sidebar_config(kwargs=None):
     sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
                     "visibility": constants.SIDEBAR_FORMAT, 'public': True,
                     "page": "format", "show_text": _('Show file formats selection'), "config_show":True})
+    sidebar.append(
+        {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
+         "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
+         "show_text": _('Show archived books'), "config_show": True})
     return sidebar
 
 
-
 class UserBase:
 
     @property
diff --git a/cps/web.py b/cps/web.py
index 5c535e8d..d01b4e1a 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -46,10 +46,10 @@ from werkzeug.security import generate_password_hash, check_password_hash
 from . import constants, config, logger, isoLanguages, services, worker
 from . import searched_ids, lm, babel, db, ub, config, get_locale, app
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import common_filters, get_search_results, fill_indexpage, speaking_language, check_valid_domain, \
-        order_authors, get_typeahead, render_task_status, json_serial, get_cc_columns, \
-        get_book_cover, get_download_link, send_mail, generate_random_password, send_registration_mail, \
-        check_send_to_kindle, check_read_formats, lcase, tags_filters, reset_password
+from .helper import common_filters, get_search_results, fill_indexpage, fill_indexpage_with_archived_books, \
+    speaking_language, check_valid_domain, order_authors, get_typeahead, render_task_status, json_serial, \
+    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+    send_registration_mail, check_send_to_kindle, check_read_formats, lcase, tags_filters, reset_password
 from .pagination import Pagination
 from .redirect import redirect_back
 
@@ -342,6 +342,23 @@ def toggle_read(book_id):
     return ""
 
 
+@web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
+@login_required
+def toggle_archived(book_id):
+    archived_book = ub.session.query(ub.ArchivedBook).filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
+                                                                  ub.ArchivedBook.book_id == book_id)).first()
+    if archived_book:
+        archived_book.is_archived = not archived_book.is_archived
+    else:
+        archived_book = ub.ArchivedBook()
+        archived_book.user_id = int(current_user.id)
+        archived_book.book_id = book_id
+        archived_book.is_archived = True
+    ub.session.merge(archived_book)
+    ub.session.commit()
+    return ""
+
+
 '''
 @web.route("/ajax/getcomic/<int:book_id>/<book_format>/<int:page>")
 @login_required
@@ -537,6 +554,8 @@ def books_list(data, sort, book_id, page):
         return render_category_books(page, book_id, order)
     elif data == "language":
         return render_language_books(page, book_id, order)
+    elif data == "archived":
+        return render_archived_books(page, order)
     else:
         entries, random, pagination = fill_indexpage(page, db.Books, True, order)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
@@ -1011,6 +1030,26 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs)
                                      title=name, page=pagename)
 
 
+def render_archived_books(page, order):
+    order = order or []
+    archived_books = (
+        ub.session.query(ub.ArchivedBook)
+        .filter(ub.ArchivedBook.user_id == int(current_user.id))
+        .filter(ub.ArchivedBook.is_archived == True)
+        .all()
+    )
+    archived_book_ids = [archived_book.book_id for archived_book in archived_books]
+
+    archived_filter = db.Books.id.in_(archived_book_ids)
+
+    entries, random, pagination = fill_indexpage_with_archived_books(page, db.Books, archived_filter, order,
+                                                                     allow_show_archived=True)
+
+    name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
+    pagename = "archived"
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+                                 title=name, page=pagename)
+
 # ################################### Download/Send ##################################################################
 
 
@@ -1423,7 +1462,8 @@ def read_book(book_id, book_format):
 @web.route("/book/<int:book_id>")
 @login_required_if_no_ano
 def show_book(book_id):
-    entries = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
+    entries = db.session.query(db.Books).filter(and_(db.Books.id == book_id,
+                                                     common_filters(allow_show_archived=True))).first()
     if entries:
         for index in range(0, len(entries.languages)):
             try:
@@ -1451,8 +1491,14 @@ def show_book(book_id):
                     log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
                     have_read = None
 
+            archived_book = ub.session.query(ub.ArchivedBook).\
+                filter(and_(ub.ArchivedBook.user_id == int(current_user.id),
+                            ub.ArchivedBook.book_id == book_id)).first()
+            is_archived = archived_book and archived_book.is_archived
+
         else:
             have_read = None
+            is_archived = None
 
         entries.tags = sort(entries.tags, key=lambda tag: tag.name)
 
@@ -1468,7 +1514,8 @@ def show_book(book_id):
 
         return render_title_template('detail.html', entry=entries, audioentries=audioentries, cc=cc,
                                      is_xhr=request.is_xhr, title=entries.title, books_shelfs=book_in_shelfs,
-                                     have_read=have_read, kindle_list=kindle_list, reader_list=reader_list, page="book")
+                                     have_read=have_read, is_archived=is_archived, kindle_list=kindle_list,
+                                     reader_list=reader_list, page="book")
     else:
         log.debug(u"Error opening eBook. File does not exist or file is not accessible:")
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")

From 5027aeb3a0ea833d7ca87668f05ebb925bf6e436 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sat, 25 Jan 2020 23:46:50 -0500
Subject: [PATCH 08/38] Fix bug where last_created is incorectly set in the
 SyncToken.

---
 cps/kobo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 57ef1ab5..f1533580 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -130,7 +130,7 @@ def HandleSyncRequest():
     changed_entries = (
         db.session.query(db.Books)
         .join(db.Data)
-        .filter(func.datetime(db.Books.last_modified) != sync_token.books_last_modified)
+        .filter(func.datetime(db.Books.last_modified) > sync_token.books_last_modified)
         .filter(db.Data.format.in_(KOBO_FORMATS))
         .filter(db.Books.id.notin_(archived_book_ids))
         .all()
@@ -149,7 +149,7 @@ def HandleSyncRequest():
         new_books_last_modified = max(
             book.last_modified, sync_token.books_last_modified
         )
-        new_books_last_created = max(book.timestamp, sync_token.books_last_modified)
+        new_books_last_created = max(book.timestamp, sync_token.books_last_created)
 
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified

From 4547c328bc9c3e61def8fd36e901d281fb9d7caa Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sat, 25 Jan 2020 23:54:12 -0500
Subject: [PATCH 09/38] Delete/Restore book from Kobo device upon (un)archiving
 of a book in the web UI.

---
 cps/kobo.py               | 35 ++++++++++++++++++++++++-----------
 cps/services/SyncToken.py | 24 +++++++++++++++++-------
 cps/ub.py                 |  1 +
 cps/web.py                |  5 ++---
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index f1533580..3c19b66e 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -39,6 +39,7 @@ from flask import (
 from flask_login import login_required, current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
+from sqlalchemy.sql.expression import or_
 import requests
 
 from . import config, logger, kobo_auth, db, helper, ub
@@ -119,10 +120,23 @@ def HandleSyncRequest():
     archived_books = (
         ub.session.query(ub.ArchivedBook)
         .filter(ub.ArchivedBook.user_id == int(current_user.id))
-        .filter(ub.ArchivedBook.is_archived == True)
         .all()
     )
-    archived_book_ids = [archived_book.book_id for archived_book in archived_books]
+
+    # We join-in books that have had their Archived bit recently modified in order to either:
+    #   * Restore them to the user's device.
+    #   * Delete them from the user's device.
+    # (Ideally we would use a join for this logic, however cross-database joins don't look trivial in SqlAlchemy.)
+    recently_restored_or_archived_books = []
+    archived_book_ids = {}
+    new_archived_last_modified = datetime.min
+    for archived_book in archived_books:
+        if archived_book.last_modified > sync_token.archive_last_modified:
+            recently_restored_or_archived_books.append(archived_book.book_id)
+        if archived_book.is_archived:
+            archived_book_ids[archived_book.book_id] = True
+        new_archived_last_modified = max(
+            new_archived_last_modified, archived_book.last_modified)
 
     # sqlite gives unexpected results when performing the last_modified comparison without the datetime cast.
     # It looks like it's treating the db.Books.last_modified field as a string and may fail
@@ -130,14 +144,14 @@ def HandleSyncRequest():
     changed_entries = (
         db.session.query(db.Books)
         .join(db.Data)
-        .filter(func.datetime(db.Books.last_modified) > sync_token.books_last_modified)
+        .filter(or_(func.datetime(db.Books.last_modified) > sync_token.books_last_modified,
+                    db.Books.id.in_(recently_restored_or_archived_books)))
         .filter(db.Data.format.in_(KOBO_FORMATS))
-        .filter(db.Books.id.notin_(archived_book_ids))
         .all()
     )
     for book in changed_entries:
         entitlement = {
-            "BookEntitlement": create_book_entitlement(book),
+            "BookEntitlement": create_book_entitlement(book, archived=(book.id in archived_book_ids)),
             "BookMetadata": get_metadata(book),
             "ReadingState": reading_state(book),
         }
@@ -153,8 +167,7 @@ def HandleSyncRequest():
 
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified
-
-    # Missing feature: Detect server-side book deletions.
+    sync_token.archive_last_modified = new_archived_last_modified
 
     return generate_sync_response(request, sync_token, entitlements)
 
@@ -216,7 +229,7 @@ def get_download_url_for_book(book, book_format):
     )
 
 
-def create_book_entitlement(book):
+def create_book_entitlement(book, archived):
     book_uuid = book.uuid
     return {
         "Accessibility": "Full",
@@ -224,10 +237,9 @@ def create_book_entitlement(book):
         "Created": book.timestamp,
         "CrossRevisionId": book_uuid,
         "Id": book_uuid,
+        "IsRemoved": archived,
         "IsHiddenFromArchive": False,
         "IsLocked": False,
-        # Setting this to true removes from the device.
-        "IsRemoved": False,
         "LastModified": book.last_modified,
         "OriginCategory": "Imported",
         "RevisionId": book_uuid,
@@ -370,8 +382,9 @@ def HandleBookDeletionRequest(book_uuid):
     )
     if not archived_book:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
-        archived_book.book_id = book_id
     archived_book.is_archived = True
+    archived_book.last_modified = datetime.utcnow()
+
     ub.session.merge(archived_book)
     ub.session.commit()
 
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 21f16acc..1a9b1843 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -42,6 +42,13 @@ def to_epoch_timestamp(datetime_object):
     return (datetime_object - datetime(1970, 1, 1)).total_seconds()
 
 
+def get_datetime_from_json(json_object, field_name):
+    try:
+        return datetime.utcfromtimestamp(json_object[field_name])
+    except KeyError:
+        return datetime.min
+
+
 class SyncToken():
     """ The SyncToken is used to persist state accross requests.
     When serialized over the response headers, the Kobo device will propagate the token onto following requests to the service.
@@ -53,7 +60,8 @@ class SyncToken():
     """
 
     SYNC_TOKEN_HEADER = "x-kobo-synctoken"
-    VERSION = "1-0-0"
+    VERSION = "1-1-0"
+    LAST_MODIFIED_ADDED_VERSION = "1-1-0"
     MIN_VERSION = "1-0-0"
 
     token_schema = {
@@ -68,6 +76,7 @@ class SyncToken():
             "raw_kobo_store_token": {"type": "string"},
             "books_last_modified": {"type": "string"},
             "books_last_created": {"type": "string"},
+            "archive_last_modified": {"type": "string"},
         },
     }
 
@@ -76,10 +85,12 @@ class SyncToken():
         raw_kobo_store_token="",
         books_last_created=datetime.min,
         books_last_modified=datetime.min,
+        archive_last_modified=datetime.min,
     ):
         self.raw_kobo_store_token = raw_kobo_store_token
         self.books_last_created = books_last_created
         self.books_last_modified = books_last_modified
+        self.archive_last_modified = archive_last_modified
 
     @staticmethod
     def from_headers(headers):
@@ -109,12 +120,9 @@ class SyncToken():
 
         raw_kobo_store_token = data_json["raw_kobo_store_token"]
         try:
-            books_last_modified = datetime.utcfromtimestamp(
-                data_json["books_last_modified"]
-            )
-            books_last_created = datetime.utcfromtimestamp(
-                data_json["books_last_created"]
-            )
+            books_last_modified = get_datetime_from_json(data_json, "books_last_modified")
+            books_last_created = get_datetime_from_json(data_json, "books_last_created")
+            archive_last_modified = get_datetime_from_json(data_json, "archive_last_modified")
         except TypeError:
             log.error("SyncToken timestamps don't parse to a datetime.")
             return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
@@ -123,6 +131,7 @@ class SyncToken():
             raw_kobo_store_token=raw_kobo_store_token,
             books_last_created=books_last_created,
             books_last_modified=books_last_modified,
+            archive_last_modified=archive_last_modified
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -143,6 +152,7 @@ class SyncToken():
                 "raw_kobo_store_token": self.raw_kobo_store_token,
                 "books_last_modified": to_epoch_timestamp(self.books_last_modified),
                 "books_last_created": to_epoch_timestamp(self.books_last_created),
+                "archive_last_modified": to_epoch_timestamp(self.archive_last_modified)
             },
         }
         return b64encode_json(token)
diff --git a/cps/ub.py b/cps/ub.py
index 62ba82af..c1b92fb6 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -311,6 +311,7 @@ class ArchivedBook(Base):
     user_id = Column(Integer, ForeignKey('user.id'))
     book_id = Column(Integer)
     is_archived = Column(Boolean, unique=False)
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow)
 
 
 # Baseclass representing Downloads from calibre-web in app.db
diff --git a/cps/web.py b/cps/web.py
index d01b4e1a..87dfd775 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -349,10 +349,9 @@ def toggle_archived(book_id):
                                                                   ub.ArchivedBook.book_id == book_id)).first()
     if archived_book:
         archived_book.is_archived = not archived_book.is_archived
+        archived_book.last_modified = datetime.datetime.utcnow()
     else:
-        archived_book = ub.ArchivedBook()
-        archived_book.user_id = int(current_user.id)
-        archived_book.book_id = book_id
+        archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
         archived_book.is_archived = True
     ub.session.merge(archived_book)
     ub.session.commit()

From dc7aaae235f0bbc3d3552ffed8e9158c685661e4 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sun, 26 Jan 2020 16:01:27 -0500
Subject: [PATCH 10/38] Now that CalibreWeb delete requests are respected, we
 can forward them to the KoboStore for books that aren't in Calibre.

Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
---
 cps/kobo.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index d06b924d..ba1e171e 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -77,9 +77,6 @@ def redirect_or_proxy_request():
     if config.config_kobo_proxy:
         if request.method == "GET":
             return redirect(get_store_url_for_current_request(), 307)
-        if request.method == "DELETE":
-            log.info('Delete Book')
-            return make_response(jsonify({}))
         else:
             # The Kobo device turns other request types into GET requests on redirects, so we instead proxy to the Kobo store ourselves.
             outgoing_headers = Headers(request.headers)

From f9dbc6bc78c8d6901cc8ccb1748066ffc7d94ab8 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sun, 26 Jan 2020 16:20:10 -0500
Subject: [PATCH 11/38] Clean-up book from ArchivedBook on hard-delete.

This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
---
 cps/editbooks.py             |  2 ++
 cps/templates/book_edit.html | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 0bb005fb..cfbae1e6 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -159,6 +159,7 @@ def delete_book(book_id, book_format):
                 # delete book from Shelfs, Downloads, Read list
                 ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
                 ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id).delete()
+                ub.session.query(ub.ArchivedBook).filter(ub.ReadBook.book_id == book_id).delete()
                 ub.delete_download(book_id)
                 ub.session.commit()
 
@@ -241,6 +242,7 @@ def render_edit_book(book_id):
     return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,
                                  title=_(u"edit metadata"), page="editbook",
                                  conversion_formats=allowed_conversion_formats,
+                                 config=config,
                                  source_formats=valid_source_formats)
 
 
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 78b427eb..efe86aed 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -185,8 +185,16 @@
           <span>{{_('Are you really sure?')}}</span>
       </div>
         <div class="modal-body text-center">
-          <span>{{_('Book will be deleted from Calibre database')}}</span>
-          <span>{{_('and from hard disk')}}</span>
+          <p>
+            <span>{{_('Book will be deleted from Calibre database')}}</span>
+            <span>{{_('and from hard disk')}}</span>
+          </p>
+          {% if config.config_kobo_sync %}
+          <p>
+            <span>{{_('Important Kobo Note: deleted books will remain on any paired Kobo device.')}}</span>
+            <span>{{_('Books must first be archived and the device synced before a book can safely be deleted.')}}</span>
+          </p>
+          {% endif %}
         </div>
 
       <div class="modal-footer">

From 57d37ffba8ba0a8fbb6429af4f7350dbd8fb3fc1 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sat, 1 Feb 2020 16:45:34 -0500
Subject: [PATCH 12/38] Add schema support for more reading states to the
 ReadBook table.

---
 cps/ub.py  | 15 ++++++++++++++-
 cps/web.py | 12 ++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/cps/ub.py b/cps/ub.py
index 21dc6e3c..1e39af7e 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -34,8 +34,9 @@ except ImportError:
 from sqlalchemy import create_engine, exc, exists
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime
-from sqlalchemy.orm import relationship, sessionmaker
+from sqlalchemy.orm import foreign, relationship, remote, sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.sql.expression import and_
 from werkzeug.security import generate_password_hash
 
 from . import constants # , config
@@ -284,10 +285,15 @@ class BookShelf(Base):
 class ReadBook(Base):
     __tablename__ = 'book_read_link'
 
+    STATUS_UNREAD = 0
+    STATUS_FINISHED = 1
+    STATUS_IN_PROGRESS = 2
+
     id = Column(Integer, primary_key=True)
     book_id = Column(Integer, unique=False)
     user_id = Column(Integer, ForeignKey('user.id'), unique=False)
     is_read = Column(Boolean, unique=False)
+    read_status = Column(Integer, unique=False, default=STATUS_UNREAD)
 
 
 class Bookmark(Base):
@@ -373,6 +379,13 @@ def migrate_Database(session):
         conn.execute("ALTER TABLE remote_auth_token ADD column 'token_type' INTEGER DEFAULT 0")
         conn.execute("update remote_auth_token set 'token_type' = 0")
         session.commit()
+    try:
+        session.query(exists().where(ReadBook.read_status)).scalar()
+    except exc.OperationalError:  # Database is not compatible, some columns are missing
+        conn = engine.connect()
+        conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
+        conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
+        session.commit()
 
     # Handle table exists, but no content
     cnt = session.query(Registration).count()
diff --git a/cps/web.py b/cps/web.py
index 35cc5d97..a2aa047f 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -314,12 +314,15 @@ def toggle_read(book_id):
         book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
                                                          ub.ReadBook.book_id == book_id)).first()
         if book:
-            book.is_read = not book.is_read
+            if book.read_status == ub.ReadBook.STATUS_FINISHED:
+                book.read_status = ub.ReadBook.STATUS_UNREAD
+            else:
+                book.read_status = ub.ReadBook.STATUS_FINISHED
         else:
             readBook = ub.ReadBook()
             readBook.user_id = int(current_user.id)
             readBook.book_id = book_id
-            readBook.is_read = True
+            readBook.read_status = ub.ReadBook.STATUS_FINISHED
             book = readBook
         ub.session.merge(book)
         ub.session.commit()
@@ -980,7 +983,7 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs)
     order = order or []
     if not config.config_read_column:
         readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\
-            .filter(ub.ReadBook.is_read == True).all()
+            .filter(ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED).all()
         readBookIds = [x.book_id for x in readBooks]
     else:
         try:
@@ -1448,7 +1451,8 @@ def show_book(book_id):
             if not config.config_read_column:
                 matching_have_read_book = ub.session.query(ub.ReadBook).\
                     filter(and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == book_id)).all()
-                have_read = len(matching_have_read_book) > 0 and matching_have_read_book[0].is_read
+                have_read = len(
+                    matching_have_read_book) > 0 and matching_have_read_book[0].read_status == ub.ReadBook.STATUS_FINISHED
             else:
                 try:
                     matching_have_read_book = getattr(entries, 'custom_column_'+str(config.config_read_column))

From 8e1641dac9c9211ef324d5aeb8cfd399cc496bc0 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sat, 15 Feb 2020 17:27:07 -0500
Subject: [PATCH 13/38] Add support for syncing Kobo reading state.

---
 cps/kobo.py               | 216 ++++++++++++++++++++++++++++++++------
 cps/services/SyncToken.py |  25 +++--
 cps/ub.py                 |  74 +++++++++++--
 cps/web.py                |   9 +-
 4 files changed, 278 insertions(+), 46 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 15a17022..192d10fe 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -17,11 +17,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import datetime
 import sys
 import base64
 import os
 import uuid
-from datetime import datetime
 from time import gmtime, strftime
 try:
     from urllib import unquote
@@ -38,12 +38,13 @@ from flask import (
     redirect,
     abort
 )
-from flask_login import login_required
+from flask_login import current_user, login_required
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
+from sqlalchemy.sql.expression import and_
 import requests
 
-from . import config, logger, kobo_auth, db, helper
+from . import config, logger, kobo_auth, db, helper, ub
 from .services import SyncToken as SyncToken
 from .web import download_required
 from .kobo_auth import requires_kobo_auth
@@ -116,6 +117,9 @@ def redirect_or_proxy_request():
         return make_response(jsonify({}))
 
 
+def convert_to_kobo_timestamp_string(timestamp):
+    return timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
+
 @kobo.route("/v1/library/sync")
 @requires_kobo_auth
 @download_required
@@ -130,7 +134,8 @@ def HandleSyncRequest():
 
     new_books_last_modified = sync_token.books_last_modified
     new_books_last_created = sync_token.books_last_created
-    entitlements = []
+    new_reading_state_last_modified = sync_token.reading_state_last_modified
+    sync_results = []
 
     # We reload the book database so that the user get's a fresh view of the library
     # in case of external changes (e.g: adding a book through Calibre).
@@ -147,41 +152,63 @@ def HandleSyncRequest():
         .all()
     )
 
+    reading_states_in_new_entitlements = []
     for book in changed_entries:
+        kobo_reading_state = get_or_create_reading_state(book.id)
         entitlement = {
             "BookEntitlement": create_book_entitlement(book),
             "BookMetadata": get_metadata(book),
-            "ReadingState": reading_state(book),
         }
+
+        if kobo_reading_state.last_modified > sync_token.reading_state_last_modified:
+            entitlement["ReadingState"] = get_kobo_reading_state_response(book, kobo_reading_state)
+            new_reading_state_last_modified = max(new_reading_state_last_modified, kobo_reading_state.last_modified)
+            reading_states_in_new_entitlements.append(book.id)
+
         if book.timestamp > sync_token.books_last_created:
-            entitlements.append({"NewEntitlement": entitlement})
+            sync_results.append({"NewEntitlement": entitlement})
         else:
-            entitlements.append({"ChangedEntitlement": entitlement})
+            sync_results.append({"ChangedEntitlement": entitlement})
 
         new_books_last_modified = max(
             book.last_modified, sync_token.books_last_modified
         )
         new_books_last_created = max(book.timestamp, sync_token.books_last_created)
 
+    changed_reading_states = (
+        ub.session.query(ub.KoboReadingState)
+        .filter(and_(func.datetime(ub.KoboReadingState.last_modified) > sync_token.reading_state_last_modified,
+                     ub.KoboReadingState.user_id == current_user.id,
+                     ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements))))
+    for kobo_reading_state in changed_reading_states.all():
+        book = db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one()
+        sync_results.append({
+            "ChangedReadingState": {
+                "ReadingState": get_kobo_reading_state_response(book, kobo_reading_state)
+            }
+        })
+        new_reading_state_last_modified = max(new_reading_state_last_modified, kobo_reading_state.last_modified)
+
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified
+    sync_token.reading_state_last_modified = new_reading_state_last_modified
 
     if config.config_kobo_proxy:
-        return generate_sync_response(request, sync_token, entitlements)
+        return generate_sync_response(request, sync_token, sync_results)
 
-    return make_response(jsonify(entitlements))
+    return make_response(jsonify(sync_results))
     # Missing feature: Detect server-side book deletions.
 
 
-def generate_sync_response(request, sync_token, entitlements):
+def generate_sync_response(request, sync_token, sync_results):
     extra_headers = {}
     if config.config_kobo_proxy:
         # Merge in sync results from the official Kobo store.
         try:
             store_response = make_request_to_kobo_store(sync_token)
 
-            store_entitlements = store_response.json()
-            entitlements += store_entitlements
+            store_sync_results = store_response.json()
+            sync_results += store_sync_results
             sync_token.merge_from_store_response(store_response)
             extra_headers["x-kobo-sync"] = store_response.headers.get("x-kobo-sync")
             extra_headers["x-kobo-sync-mode"] = store_response.headers.get("x-kobo-sync-mode")
@@ -191,7 +218,7 @@ def generate_sync_response(request, sync_token, entitlements):
             log.error("Failed to receive or parse response from Kobo's sync endpoint: " + str(e))
     sync_token.to_headers(extra_headers)
 
-    response = make_response(jsonify(entitlements), extra_headers)
+    response = make_response(jsonify(sync_results), extra_headers)
 
     return response
 
@@ -243,25 +270,21 @@ def create_book_entitlement(book):
     book_uuid = book.uuid
     return {
         "Accessibility": "Full",
-        "ActivePeriod": {"From": current_time(),},
-        "Created": book.timestamp.strftime("%Y-%m-%dT%H:%M:%SZ"),
+        "ActivePeriod": {"From": convert_to_kobo_timestamp_string(datetime.datetime.now())},
+        "Created": convert_to_kobo_timestamp_string(book.timestamp),
         "CrossRevisionId": book_uuid,
         "Id": book_uuid,
         "IsHiddenFromArchive": False,
         "IsLocked": False,
         # Setting this to true removes from the device.
         "IsRemoved": False,
-        "LastModified": book.last_modified.strftime("%Y-%m-%dT%H:%M:%SZ"),
+        "LastModified": convert_to_kobo_timestamp_string(book.last_modified),
         "OriginCategory": "Imported",
         "RevisionId": book_uuid,
         "Status": "Active",
     }
 
 
-def current_time():
-    return strftime("%Y-%m-%dT%H:%M:%SZ", gmtime())
-
-
 def get_description(book):
     if not book.comments:
         return None
@@ -324,6 +347,8 @@ def get_metadata(book):
         "IsSocialEnabled": True,
         "Language": "en",
         "PhoneticPronunciations": {},
+        # TODO: Fix book.pubdate to return a datetime object so that we can easily
+        # convert it to the format Kobo devices expect.
         "PublicationDate": book.pubdate,
         "Publisher": {"Imprint": "", "Name": get_publisher(book),},
         "RevisionId": book_uuid,
@@ -347,16 +372,148 @@ def get_metadata(book):
     return metadata
 
 
-def reading_state(book):
-    # TODO: Implement
-    reading_state = {
-        # "StatusInfo": {
-        #     "LastModified": get_single_cc_value(book, "lastreadtimestamp"),
-        #     "Status": get_single_cc_value(book, "reading_status"),
-        # }
-        # TODO: CurrentBookmark, Location
+@kobo.route("/v1/library/<book_uuid>/state", methods=["GET", "PUT"])
+@login_required
+def HandleStateRequest(book_uuid):
+    book = db.session.query(db.Books).filter(db.Books.uuid == book_uuid).first()
+    if not book or not book.data:
+        log.info(u"Book %s not found in database", book_uuid)
+        return redirect_or_proxy_request()
+
+    kobo_reading_state = get_or_create_reading_state(book.id)
+
+    if request.method == "GET":
+        return jsonify([get_kobo_reading_state_response(book, kobo_reading_state)])
+    else:
+        update_results_response = {"EntitlementId": book_uuid}
+
+        request_data = request.json
+        if "ReadingStates" not in request_data:
+            abort(400, description="Malformed request data is missing 'ReadingStates' key")
+        request_reading_state = request_data["ReadingStates"][0]
+
+        request_bookmark = request_reading_state.get("CurrentBookmark")
+        if request_bookmark:
+            current_bookmark = kobo_reading_state.current_bookmark
+            current_bookmark.progress_percent = request_bookmark.get("ProgressPercent")
+            current_bookmark.content_source_progress_percent = request_bookmark.get("ContentSourceProgressPercent")
+            location = request_bookmark.get("Location")
+            if location:
+                current_bookmark.location_value = location.get("Value")
+                current_bookmark.location_type = location.get("Type")
+                current_bookmark.location_source = location.get("Source")
+            update_results_response["CurrentBookmarkResult"] = {"Result": "Success"}
+
+        request_statistics = request_reading_state.get("Statistics")
+        if request_statistics:
+            statistics = kobo_reading_state.statistics
+            statistics.spent_reading_minutes = request_statistics.get("SpentReadingMinutes")
+            statistics.remaining_time_minutes = request_statistics.get("RemainingTimeMinutes")
+            update_results_response["StatisticsResult"] = {"Result": "Success"}
+
+        request_status_info = request_reading_state.get("StatusInfo")
+        if request_status_info:
+            book_read = kobo_reading_state.book_read_link
+            new_book_read_status = get_ub_read_status(request_status_info.get("Status"))
+            if new_book_read_status == ub.ReadBook.STATUS_IN_PROGRESS and new_book_read_status != book_read.read_status:
+                book_read.times_started_reading += 1
+                book_read.last_time_started_reading = datetime.datetime.utcnow()
+            book_read.read_status = new_book_read_status
+            update_results_response["StatusInfoResult"] = {"Result": "Success"}
+
+        ub.session.merge(kobo_reading_state)
+        ub.session.commit()
+        return jsonify({
+            "RequestResult": "Success",
+            "UpdateResults": [update_results_response],
+        })
+
+
+def get_read_status_for_kobo(ub_book_read):
+    enum_to_string_map = {
+        None: "ReadyToRead",
+        ub.ReadBook.STATUS_UNREAD: "ReadyToRead",
+        ub.ReadBook.STATUS_FINISHED: "Finished",
+        ub.ReadBook.STATUS_IN_PROGRESS: "Reading",
+    }
+    return enum_to_string_map[ub_book_read.read_status]
+
+
+def get_ub_read_status(kobo_read_status):
+    string_to_enum_map = {
+        None: None,
+        "ReadyToRead": ub.ReadBook.STATUS_UNREAD,
+        "Finished": ub.ReadBook.STATUS_FINISHED,
+        "Reading": ub.ReadBook.STATUS_IN_PROGRESS,
     }
-    return reading_state
+    return string_to_enum_map[kobo_read_status]
+
+
+def get_or_create_reading_state(book_id):
+    book_read = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.book_id == book_id,
+                                                          ub.ReadBook.user_id == current_user.id)).one_or_none()
+    if not book_read:
+        book_read = ub.ReadBook(user_id=current_user.id, book_id=book_id)
+    if not book_read.kobo_reading_state:
+        kobo_reading_state = ub.KoboReadingState(user_id=book_read.user_id, book_id=book_id)
+        kobo_reading_state.current_bookmark = ub.KoboBookmark()
+        kobo_reading_state.statistics = ub.KoboStatistics()
+        book_read.kobo_reading_state = kobo_reading_state
+    ub.session.add(book_read)
+    ub.session.commit()
+    return book_read.kobo_reading_state
+
+
+def get_kobo_reading_state_response(book, kobo_reading_state):
+    return {
+        "EntitlementId": book.uuid,
+        "Created": convert_to_kobo_timestamp_string(book.timestamp),
+        "LastModified": convert_to_kobo_timestamp_string(kobo_reading_state.last_modified),
+        # AFAICT PriorityTimestamp is always equal to LastModified.
+        "PriorityTimestamp": convert_to_kobo_timestamp_string(kobo_reading_state.priority_timestamp),
+        "StatusInfo": get_status_info_response(kobo_reading_state.book_read_link),
+        "Statistics": get_statistics_response(kobo_reading_state.statistics),
+        "CurrentBookmark": get_current_bookmark_response(kobo_reading_state.current_bookmark),
+    }
+
+
+def get_status_info_response(book_read):
+    resp = {
+        "LastModified": convert_to_kobo_timestamp_string(book_read.last_modified),
+        "Status": get_read_status_for_kobo(book_read),
+        "TimesStartedReading": book_read.times_started_reading,
+    }
+    if book_read.last_time_started_reading:
+        resp["LastTimeStartedReading"] = convert_to_kobo_timestamp_string(book_read.last_time_started_reading)
+    return resp
+
+
+def get_statistics_response(statistics):
+    resp = {
+        "LastModified": convert_to_kobo_timestamp_string(statistics.last_modified),
+    }
+    if statistics.spent_reading_minutes:
+        resp["SpentReadingMinutes"] = statistics.spent_reading_minutes
+    if statistics.remaining_time_minutes:
+        resp["RemainingTimeMinutes"] = statistics.remaining_time_minutes
+    return resp
+
+
+def get_current_bookmark_response(current_bookmark):
+    resp = {
+        "LastModified": convert_to_kobo_timestamp_string(current_bookmark.last_modified),
+    }
+    if current_bookmark.progress_percent:
+        resp["ProgressPercent"] = current_bookmark.progress_percent
+    if current_bookmark.content_source_progress_percent:
+        resp["ContentSourceProgressPercent"] = current_bookmark.content_source_progress_percent
+    if current_bookmark.location_value:
+        resp["Location"] = {
+            "Value": current_bookmark.location_value,
+            "Type": current_bookmark.location_type,
+            "Source": current_bookmark.location_source,
+        }
+    return resp
 
 
 @kobo.route("/<book_uuid>/image.jpg")
@@ -381,7 +538,6 @@ def TopLevelEndpoint():
 
 # TODO: Implement the following routes
 @kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
-@kobo.route("/v1/library/<book_uuid>/state", methods=["PUT"])
 @kobo.route("/v1/library/tags", methods=["POST"])
 @kobo.route("/v1/library/tags/<shelf_name>", methods=["POST"])
 @kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE"])
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 63d82ac0..133942b3 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -42,6 +42,13 @@ def to_epoch_timestamp(datetime_object):
     return (datetime_object - datetime(1970, 1, 1)).total_seconds()
 
 
+def get_datetime_from_json(json_object, field_name):
+    try:
+        return datetime.utcfromtimestamp(json_object[field_name])
+    except KeyError:
+        return datetime.min
+
+
 class SyncToken():
     """ The SyncToken is used to persist state accross requests.
     When serialized over the response headers, the Kobo device will propagate the token onto following requests to the service.
@@ -53,7 +60,8 @@ class SyncToken():
     """
 
     SYNC_TOKEN_HEADER = "x-kobo-synctoken"
-    VERSION = "1-0-0"
+    VERSION = "1-1-0"
+    LAST_MODIFIED_ADDED_VERSION = "1-1-0"
     MIN_VERSION = "1-0-0"
 
     token_schema = {
@@ -68,6 +76,7 @@ class SyncToken():
             "raw_kobo_store_token": {"type": "string"},
             "books_last_modified": {"type": "string"},
             "books_last_created": {"type": "string"},
+            "reading_state_last_modified": {"type": "string"},
         },
     }
 
@@ -76,10 +85,13 @@ class SyncToken():
         raw_kobo_store_token="",
         books_last_created=datetime.min,
         books_last_modified=datetime.min,
+        reading_state_last_modified=datetime.min,
     ):
         self.raw_kobo_store_token = raw_kobo_store_token
         self.books_last_created = books_last_created
         self.books_last_modified = books_last_modified
+        self.reading_state_last_modified = reading_state_last_modified
+
 
     @staticmethod
     def from_headers(headers):
@@ -109,12 +121,9 @@ class SyncToken():
 
         raw_kobo_store_token = data_json["raw_kobo_store_token"]
         try:
-            books_last_modified = datetime.utcfromtimestamp(
-                data_json["books_last_modified"]
-            )
-            books_last_created = datetime.utcfromtimestamp(
-                data_json["books_last_created"]
-            )
+            books_last_modified = get_datetime_from_json(data_json, "books_last_modified")
+            books_last_created = get_datetime_from_json(data_json, "books_last_created")
+            reading_state_last_modified = get_datetime_from_json(data_json, "reading_state_last_modified")
         except TypeError:
             log.error("SyncToken timestamps don't parse to a datetime.")
             return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
@@ -123,6 +132,7 @@ class SyncToken():
             raw_kobo_store_token=raw_kobo_store_token,
             books_last_created=books_last_created,
             books_last_modified=books_last_modified,
+            reading_state_last_modified=reading_state_last_modified
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -143,6 +153,7 @@ class SyncToken():
                 "raw_kobo_store_token": self.raw_kobo_store_token,
                 "books_last_modified": to_epoch_timestamp(self.books_last_modified),
                 "books_last_created": to_epoch_timestamp(self.books_last_created),
+                "reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified)
             },
         }
         return b64encode_json(token)
diff --git a/cps/ub.py b/cps/ub.py
index 1e39af7e..f68ae8ab 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -20,6 +20,7 @@
 from __future__ import division, print_function, unicode_literals
 import os
 import datetime
+import itertools
 from binascii import hexlify
 
 from flask import g
@@ -31,10 +32,10 @@ try:
     oauth_support = True
 except ImportError:
     oauth_support = False
-from sqlalchemy import create_engine, exc, exists
+from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
-from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime
-from sqlalchemy.orm import foreign, relationship, remote, sessionmaker
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float
+from sqlalchemy.orm import backref, foreign, relationship, remote, sessionmaker, Session
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql.expression import and_
 from werkzeug.security import generate_password_hash
@@ -292,8 +293,12 @@ class ReadBook(Base):
     id = Column(Integer, primary_key=True)
     book_id = Column(Integer, unique=False)
     user_id = Column(Integer, ForeignKey('user.id'), unique=False)
-    is_read = Column(Boolean, unique=False)
-    read_status = Column(Integer, unique=False, default=STATUS_UNREAD)
+    read_status = Column(Integer, unique=False, default=STATUS_UNREAD, nullable=False)
+    kobo_reading_state = relationship("KoboReadingState", uselist=False, primaryjoin="and_(ReadBook.user_id == foreign(KoboReadingState.user_id), "
+                                "ReadBook.book_id == foreign(KoboReadingState.book_id))", cascade="all", backref=backref("book_read_link", uselist=False))
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
+    last_time_started_reading = Column(DateTime, nullable=True)
+    times_started_reading = Column(Integer, default=0, nullable=False)
 
 
 class Bookmark(Base):
@@ -306,6 +311,54 @@ class Bookmark(Base):
     bookmark_key = Column(String)
 
 
+# The Kobo ReadingState API keeps track of 4 timestamped entities:
+#   ReadingState, StatusInfo, Statistics, CurrentBookmark
+# Which we map to the following 4 tables:
+#   KoboReadingState, ReadBook, KoboStatistics and KoboBookmark
+class KoboReadingState(Base):
+    __tablename__ = 'kobo_reading_state'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_id = Column(Integer, ForeignKey('user.id'))
+    book_id = Column(Integer)
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
+    priority_timestamp = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
+    current_bookmark = relationship("KoboBookmark", uselist=False, backref="kobo_reading_state", cascade="all")
+    statistics = relationship("KoboStatistics", uselist=False, backref="kobo_reading_state", cascade="all")
+
+
+class KoboBookmark(Base):
+    __tablename__ = 'kobo_bookmark'
+
+    id = Column(Integer, primary_key=True)
+    kobo_reading_state_id = Column(Integer, ForeignKey('kobo_reading_state.id'))
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
+    location_source = Column(String)
+    location_type = Column(String)
+    location_value = Column(String)
+    progress_percent = Column(Float)
+    content_source_progress_percent = Column(Float)
+
+
+class KoboStatistics(Base):
+    __tablename__ = 'kobo_statistics'
+
+    id = Column(Integer, primary_key=True)
+    kobo_reading_state_id = Column(Integer, ForeignKey('kobo_reading_state.id'))
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
+    remaining_time_minutes = Column(Integer)
+    spent_reading_minutes = Column(Integer)
+
+
+# Updates the last_modified timestamp in the KoboReadingState table if any of its children tables are modified.
+@event.listens_for(Session, 'before_flush')
+def receive_before_flush(session, flush_context, instances):
+    for change in itertools.chain(session.new, session.dirty):
+        if isinstance(change, (ReadBook, KoboStatistics, KoboBookmark)):
+            if change.kobo_reading_state:
+                change.kobo_reading_state.last_modified = datetime.datetime.utcnow()
+
+
 # Baseclass representing Downloads from calibre-web in app.db
 class Downloads(Base):
     __tablename__ = 'downloads'
@@ -358,6 +411,12 @@ def migrate_Database(session):
         ReadBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "bookmark"):
         Bookmark.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "kobo_reading_state"):
+        KoboReadingState.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "kobo_bookmark"):
+        KoboBookmark.__table__.create(bind=engine)
+    if not engine.dialect.has_table(engine.connect(), "kobo_statistics"):
+        KoboStatistics.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         ReadBook.__table__.create(bind=engine)
         conn = engine.connect()
@@ -381,10 +440,13 @@ def migrate_Database(session):
         session.commit()
     try:
         session.query(exists().where(ReadBook.read_status)).scalar()
-    except exc.OperationalError:  # Database is not compatible, some columns are missing
+    except exc.OperationalError:
         conn = engine.connect()
         conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
         conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
+        conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
+        conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
+        conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")    
         session.commit()
 
     # Handle table exists, but no content
diff --git a/cps/web.py b/cps/web.py
index a2aa047f..4230d9dd 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -319,11 +319,14 @@ def toggle_read(book_id):
             else:
                 book.read_status = ub.ReadBook.STATUS_FINISHED
         else:
-            readBook = ub.ReadBook()
-            readBook.user_id = int(current_user.id)
-            readBook.book_id = book_id
+            readBook = ub.ReadBook(user_id=current_user.id, book_id = book_id)
             readBook.read_status = ub.ReadBook.STATUS_FINISHED
             book = readBook
+        if not book.kobo_reading_state:
+            kobo_reading_state = ub.KoboReadingState(user_id=current_user.id, book_id=book_id)
+            kobo_reading_state.current_bookmark = ub.KoboBookmark()
+            kobo_reading_state.statistics = ub.KoboStatistics()
+            book.kobo_reading_state = kobo_reading_state
         ub.session.merge(book)
         ub.session.commit()
     else:

From ad564e25ca32e4b831438476415886640a3c1974 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Sun, 8 Mar 2020 01:20:54 -0500
Subject: [PATCH 14/38] More fixes for Kobo Sync

- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
---
 cps/kobo.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 9830f1c2..103da848 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -159,18 +159,14 @@ def HandleSyncRequest():
             entitlements.append({"ChangedEntitlement": entitlement})
 
         new_books_last_modified = max(
-            book.last_modified, sync_token.books_last_modified
+            book.last_modified, new_books_last_modified
         )
-        new_books_last_created = max(book.timestamp, sync_token.books_last_created)
+        new_books_last_created = max(book.timestamp, new_books_last_created)
 
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified
 
-    if config.config_kobo_proxy:
-        return generate_sync_response(request, sync_token, entitlements)
-
-    return make_response(jsonify(entitlements))
-    # Missing feature: Detect server-side book deletions.
+    return generate_sync_response(request, sync_token, entitlements)
 
 
 def generate_sync_response(request, sync_token, entitlements):

From de0e27c512050b062271becb3b6053697a7c7fe7 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Thu, 12 Mar 2020 19:59:05 -0400
Subject: [PATCH 15/38] Fix #1164 merge.

---
 cps/kobo.py               | 17 +++++++++--------
 cps/services/SyncToken.py | 11 +++++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 6e284d9a..87e2d340 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -39,10 +39,10 @@ from flask import (
     redirect,
     abort
 )
-from flask_login import login_required, current_user
+from flask_login import current_user, login_required
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
-from sqlalchemy.sql.expression import or_
+from sqlalchemy.sql.expression import and_, or_
 import requests
 
 from . import config, logger, kobo_auth, db, helper, ub
@@ -152,7 +152,7 @@ def HandleSyncRequest():
     # (Ideally we would use a join for this logic, however cross-database joins don't look trivial in SqlAlchemy.)
     recently_restored_or_archived_books = []
     archived_book_ids = {}
-    new_archived_last_modified = datetime.min
+    new_archived_last_modified = datetime.datetime.min
     for archived_book in archived_books:
         if archived_book.last_modified > sync_token.archive_last_modified:
             recently_restored_or_archived_books.append(archived_book.book_id)
@@ -213,6 +213,7 @@ def HandleSyncRequest():
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified
     sync_token.archive_last_modified = new_archived_last_modified
+    sync_token.reading_state_last_modified = new_reading_state_last_modified
 
     if config.config_kobo_proxy:
         return generate_sync_response(request, sync_token, sync_results)
@@ -288,7 +289,7 @@ def create_book_entitlement(book, archived):
         "IsRemoved": archived,
         "IsHiddenFromArchive": False,
         "IsLocked": False,
-        "LastModified": book.last_modified,
+        "LastModified": convert_to_kobo_timestamp_string(book.last_modified),
         "OriginCategory": "Imported",
         "RevisionId": book_uuid,
         "Status": "Active",
@@ -568,7 +569,7 @@ def HandleBookDeletionRequest(book_uuid):
     if not archived_book:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
     archived_book.is_archived = True
-    archived_book.last_modified = datetime.utcnow()
+    archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
     ub.session.commit()
@@ -577,12 +578,12 @@ def HandleBookDeletionRequest(book_uuid):
 
 
 # TODO: Implement the following routes
-@kobo.route("/v1/library/<book_uuid>/state", methods=["PUT"])
+@kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
 @kobo.route("/v1/library/tags", methods=["POST"])
 @kobo.route("/v1/library/tags/<shelf_name>", methods=["POST"])
 @kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE"])
-def HandleUnimplementedRequest(book_uuid=None, shelf_name=None, tag_id=None):
-    log.debug("Alternative Request received:")
+def HandleUnimplementedRequest(dummy=None, book_uuid=None, shelf_name=None, tag_id=None):
+    log.debug("Unimplemented Library Request received: %s", request.base_url)
     return redirect_or_proxy_request()
 
 
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 15f788f2..9804fdb3 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -77,6 +77,7 @@ class SyncToken():
             "books_last_modified": {"type": "string"},
             "books_last_created": {"type": "string"},
             "archive_last_modified": {"type": "string"},
+            "reading_state_last_modified": {"type": "string"},
         },
     }
 
@@ -86,11 +87,14 @@ class SyncToken():
         books_last_created=datetime.min,
         books_last_modified=datetime.min,
         archive_last_modified=datetime.min,
+        reading_state_last_modified=datetime.min,
     ):
         self.raw_kobo_store_token = raw_kobo_store_token
         self.books_last_created = books_last_created
         self.books_last_modified = books_last_modified
         self.archive_last_modified = archive_last_modified
+        self.reading_state_last_modified = reading_state_last_modified
+
 
     @staticmethod
     def from_headers(headers):
@@ -123,6 +127,7 @@ class SyncToken():
             books_last_modified = get_datetime_from_json(data_json, "books_last_modified")
             books_last_created = get_datetime_from_json(data_json, "books_last_created")
             archive_last_modified = get_datetime_from_json(data_json, "archive_last_modified")
+            reading_state_last_modified = get_datetime_from_json(data_json, "reading_state_last_modified")
         except TypeError:
             log.error("SyncToken timestamps don't parse to a datetime.")
             return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
@@ -131,7 +136,8 @@ class SyncToken():
             raw_kobo_store_token=raw_kobo_store_token,
             books_last_created=books_last_created,
             books_last_modified=books_last_modified,
-            archive_last_modified=archive_last_modified
+            archive_last_modified=archive_last_modified,
+            reading_state_last_modified=reading_state_last_modified
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -152,7 +158,8 @@ class SyncToken():
                 "raw_kobo_store_token": self.raw_kobo_store_token,
                 "books_last_modified": to_epoch_timestamp(self.books_last_modified),
                 "books_last_created": to_epoch_timestamp(self.books_last_created),
-                "archive_last_modified": to_epoch_timestamp(self.archive_last_modified)
+                "archive_last_modified": to_epoch_timestamp(self.archive_last_modified),
+                "reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified)
             },
         }
         return b64encode_json(token)

From 6d1a3ccdcc51d33022b02e4abfb4473a042240f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaccs@googlemail.com>
Date: Sat, 28 Mar 2020 07:13:51 +0100
Subject: [PATCH 16/38] Improve logger for windows

---
 cps/__init__.py | 5 ++---
 cps/logger.py   | 8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 6c241d4f..48926f2c 100755
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -33,11 +33,10 @@ from flask_login import LoginManager
 from flask_babel import Babel
 from flask_principal import Principal
 
-from . import logger, cache_buster, cli, config_sql, ub, db, services
+from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 
-
 mimetypes.init()
 mimetypes.add_type('application/xhtml+xml', '.xhtml')
 mimetypes.add_type('application/epub+zip', '.epub')
@@ -62,7 +61,6 @@ lm = LoginManager()
 lm.login_view = 'web.login'
 lm.anonymous_user = ub.Anonymous
 
-
 ub.init_db(cli.settingspath)
 # pylint: disable=no-member
 config = config_sql.load_configuration(ub.session)
@@ -75,6 +73,7 @@ _BABEL_TRANSLATIONS = set()
 
 log = logger.create()
 
+from . import services
 
 def create_app():
     app.wsgi_app = ReverseProxied(app.wsgi_app)
diff --git a/cps/logger.py b/cps/logger.py
index 77a721d3..c5b686f2 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -67,6 +67,8 @@ def get_level_name(level):
 
 
 def is_valid_logfile(file_path):
+    if file_path == LOG_TO_STDERR or file_path == LOG_TO_STDOUT:
+        return True
     if not file_path:
         return True
     if os.path.isdir(file_path):
@@ -105,7 +107,9 @@ def setup(log_file, log_level=None):
         # avoid spamming the log with debug messages from libraries
         r.setLevel(log_level)
 
-    log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE)
+    # Otherwise name get's destroyed on windows
+    if log_file != LOG_TO_STDERR and log_file !=  LOG_TO_STDOUT:
+        log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE)
 
     previous_handler = r.handlers[0] if r.handlers else None
     if previous_handler:
@@ -119,7 +123,7 @@ def setup(log_file, log_level=None):
             file_handler = StreamHandler(sys.stdout)
             file_handler.baseFilename = log_file
         else:
-            file_handler = StreamHandler()
+            file_handler = StreamHandler(sys.stderr)
             file_handler.baseFilename = log_file
     else:
         try:

From 7cb6801241f380c9e2a27240b5dd6b2f348e0552 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Mon, 30 Mar 2020 02:17:08 -0400
Subject: [PATCH 17/38] Fix issue with cover images.

---
 cps/kobo.py | 87 +++++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 8ce36541..2d859730 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -535,16 +535,16 @@ def get_current_bookmark_response(current_bookmark):
     return resp
 
 
-@kobo.route("/<book_uuid>/image.jpg")
+@kobo.route("/<book_uuid>/<width>/<height>/image.jpg")
 @requires_kobo_auth
-def HandleCoverImageRequest(book_uuid):
+def HandleCoverImageRequest(book_uuid, width, height):
     book_cover = helper.get_book_cover_with_uuid(
         book_uuid, use_generic_cover_on_failure=False
     )
     if not book_cover:
         if config.config_kobo_proxy:
             log.debug("Cover for unknown book: %s proxied to kobo" % book_uuid)
-            return redirect(get_store_url_for_current_request(), 307)
+            return redirect("https://kbimages1-a.akamaihd.net/{book_uuid}/{width}/{height}/false/image.jpg".format(book_uuid=book_uuid, width=width, height=height), 307)
         else:
             log.debug("Cover for unknown book: %s requested" % book_uuid)
             return redirect_or_proxy_request()
@@ -655,18 +655,23 @@ def HandleAuthRequest():
     return make_calibre_web_auth_response()
 
 
-def make_calibre_web_init_response(calibre_web_url):
-        resources = NATIVE_KOBO_RESOURCES(calibre_web_url)
-        response = make_response(jsonify({"Resources": resources}))
-        response.headers["x-kobo-apitoken"] = "e30="
-        return response
-
-
 @kobo.route("/v1/initialization")
 @requires_kobo_auth
 def HandleInitRequest():
     log.info('Init')
 
+    kobo_resources = None
+    if config.config_kobo_proxy:
+        try:
+            store_response = make_request_to_kobo_store()
+            store_response_json = store_response.json()
+            if "Resources" in store_response_json:
+                kobo_resources = store_response_json["Resources"]
+        except:
+            log.error("Failed to receive or parse response from Kobo's init endpoint. Falling back to un-proxied mode.")
+    if not kobo_resources:
+        kobo_resources = NATIVE_KOBO_RESOURCES()
+
     if not current_app.wsgi_app.is_proxied:
         log.debug('Kobo: Received unproxied request, changed request port to server port')
         if ':' in request.host and not request.host.endswith(']'):
@@ -678,33 +683,42 @@ def HandleInitRequest():
             url_base=host,
             url_port=config.config_port
         )
+        kobo_resources["image_host"] = calibre_web_url
+        kobo_resources["image_url_quality_template"] = unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
+                                                                                         auth_token=kobo_auth.get_auth_token(),
+                                                                                         book_uuid="{ImageId}",
+                                                                                         width="{width}",
+                                                                                         height="{height}",
+                                                                                         _external=True))
+        kobo_resources["image_url_template"] = unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
+                                                                                 auth_token=kobo_auth.get_auth_token(),
+                                                                                 book_uuid="{ImageId}",
+                                                                                 width="{width}",
+                                                                                 height="{height}",
+                                                                                 _external=True))
     else:
-        calibre_web_url = url_for("web.index", _external=True).strip("/")
+        kobo_resources["image_host"] = url_for("web.index", _external=True).strip("/")
+        kobo_resources["image_url_quality_template"] = unquote(url_for("kobo.HandleCoverImageRequest",
+                                                                       auth_token=kobo_auth.get_auth_token(),
+                                                                       book_uuid="{ImageId}",
+                                                                       width="{width}",
+                                                                       height="{height}",
+                                                                       _external=True))
+        kobo_resources["image_url_template"] = unquote(url_for("kobo.HandleCoverImageRequest",
+                                                               auth_token=kobo_auth.get_auth_token(),
+                                                               book_uuid="{ImageId}",
+                                                               width="{width}",
+                                                               height="{height}",
+                                                               _external=True))
+
+
+    response = make_response(jsonify({"Resources": kobo_resources}))
+    response.headers["x-kobo-apitoken"] = "e30="
 
-    if config.config_kobo_proxy:
-        try:
-            store_response = make_request_to_kobo_store()
-
-            store_response_json = store_response.json()
-            if "Resources" in store_response_json:
-                kobo_resources = store_response_json["Resources"]
-                # calibre_web_url = url_for("web.index", _external=True).strip("/")
-                kobo_resources["image_host"] = calibre_web_url
-                kobo_resources["image_url_quality_template"] = unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
-                    auth_token = kobo_auth.get_auth_token(),
-                    book_uuid="{ImageId}"))
-                kobo_resources["image_url_template"] = unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
-                    auth_token = kobo_auth.get_auth_token(),
-                    book_uuid="{ImageId}"))
-
-            return make_response(store_response_json, store_response.status_code)
-        except:
-            log.error("Failed to receive or parse response from Kobo's init endpoint. Falling back to un-proxied mode.")
-
-    return make_calibre_web_init_response(calibre_web_url)
+    return response
 
 
-def NATIVE_KOBO_RESOURCES(calibre_web_url):
+def NATIVE_KOBO_RESOURCES():
     return {
         "account_page": "https://secure.kobobooks.com/profile",
         "account_page_rakuten": "https://my.rakuten.co.jp/",
@@ -755,13 +769,6 @@ def NATIVE_KOBO_RESOURCES(calibre_web_url):
         "giftcard_epd_redeem_url": "https://www.kobo.com/{storefront}/{language}/redeem-ereader",
         "giftcard_redeem_url": "https://www.kobo.com/{storefront}/{language}/redeem",
         "help_page": "http://www.kobo.com/help",
-        "image_host": calibre_web_url,
-        "image_url_quality_template": unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
-                auth_token = kobo_auth.get_auth_token(),
-                book_uuid="{ImageId}")),
-        "image_url_template":  unquote(calibre_web_url + url_for("kobo.HandleCoverImageRequest",
-                auth_token = kobo_auth.get_auth_token(),
-                book_uuid="{ImageId}")),
         "kobo_audiobooks_enabled": "False",
         "kobo_audiobooks_orange_deal_enabled": "False",
         "kobo_audiobooks_subscriptions_enabled": "False",

From 296ac203d49b36ef05549bf8a5ff40426096d311 Mon Sep 17 00:00:00 2001
From: Marcel <4924023+stfrbrntyu@users.noreply.github.com>
Date: Sat, 11 Apr 2020 12:32:37 +0200
Subject: [PATCH 18/38] Update messages.po

---
 cps/translations/nl/LC_MESSAGES/messages.po | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index f9d6291c..d4b6da03 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -213,7 +213,7 @@ msgstr "Algemene fout"
 
 #: cps/admin.py:968
 msgid "Update File Could Not be Saved in Temp Dir"
-msgstr ""
+msgstr "Geüpload bestand kon niet opgeslagen worden in tijdelijke map"
 
 #: cps/converter.py:31
 msgid "not configured"
@@ -271,7 +271,7 @@ msgstr "Kan het boek niet bewerken; controleer het logbestand"
 #: cps/editbooks.py:581
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
-msgstr "Bestand %(filename)s kon niet in de tijdelijke map opgeslaan worden"
+msgstr "Bestand %(filename)s kon niet in de tijdelijke map opgeslagen worden"
 
 #: cps/editbooks.py:598
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
@@ -568,12 +568,12 @@ msgstr "Sorry, je mag geen boeken verwijderen van deze boekenplank: %(sname)s"
 #: cps/shelf.py:215 cps/shelf.py:252
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Een openbare boekenplank met de naam '%(title)s' bestaat al."
 
 #: cps/shelf.py:222 cps/shelf.py:260
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
 
 #: cps/shelf.py:228
 #, python-format
@@ -586,7 +586,7 @@ msgstr "Er is een fout opgetreden"
 
 #: cps/shelf.py:232 cps/shelf.py:234 cps/templates/layout.html:143
 msgid "Create a Shelf"
-msgstr "creëer een boekenplank"
+msgstr "Maak een boekenplank"
 
 #: cps/shelf.py:270
 #, python-format
@@ -1007,7 +1007,7 @@ msgstr "Bewerken"
 
 #: cps/templates/admin.html:38
 msgid "Add New User"
-msgstr "Voeg Nieuwe Gebruiker toe"
+msgstr "Gebruiker toevoegen"
 
 #: cps/templates/admin.html:44
 msgid "E-mail Server Settings"
@@ -1785,7 +1785,7 @@ msgstr "Volgende"
 #: cps/templates/feed.xml:79 cps/templates/layout.html:136
 #: cps/templates/layout.html:140
 msgid "(Public)"
-msgstr ""
+msgstr "(Openbaar)"
 
 #: cps/templates/generate_kobo_auth_url.html:5
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
@@ -1849,11 +1849,11 @@ msgstr "Boeken gesorteerd op reeks"
 
 #: cps/templates/index.xml:93
 msgid "Books ordered by Languages"
-msgstr "Boeken gesorteerd op Taal"
+msgstr "Boeken gesorteerd op taal"
 
 #: cps/templates/index.xml:100
 msgid "Books ordered by Rating"
-msgstr ""
+msgstr "Boeken gesorteerd op beoordeling"
 
 #: cps/templates/index.xml:108
 msgid "Books ordered by file formats"
@@ -1861,7 +1861,7 @@ msgstr "Boeken gesorteerd op bestandsformaat"
 
 #: cps/templates/index.xml:111 cps/templates/layout.html:134
 msgid "Shelves"
-msgstr ""
+msgstr "Boekenplanken"
 
 #: cps/templates/index.xml:115
 msgid "Books organized in shelves"
@@ -1976,7 +1976,7 @@ msgstr "Toon Toegangslog: "
 
 #: cps/templates/modal_restriction.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr "Selecteer Toegestaan/Geweigerd tags toe"
+msgstr "Selecteer Toegestane/Geweigerde tags"
 
 #: cps/templates/modal_restriction.html:7
 msgid "Select Allowed/Denied Custom Column Values"
@@ -1984,11 +1984,11 @@ msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden"
 
 #: cps/templates/modal_restriction.html:8
 msgid "Select Allowed/Denied Tags of User"
-msgstr "Selecteer Toegestaan/Geweigerd tags van gebruikers"
+msgstr "Selecteer Toegestane/Geweigerde tags van gebruikers"
 
 #: cps/templates/modal_restriction.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden van gebruikers"
+msgstr "Selecteer Toegestane/Geweigerde aangepaste kolom waarden van gebruikers"
 
 #: cps/templates/modal_restriction.html:15
 msgid "Enter Tag"
@@ -2036,11 +2036,11 @@ msgstr "Ware grootte"
 
 #: cps/templates/readcbr.html:97
 msgid "Rotate Right"
-msgstr "Naar rechts draaien"
+msgstr "Rechtsom draaien"
 
 #: cps/templates/readcbr.html:98
 msgid "Rotate Left"
-msgstr "Naar links draaien"
+msgstr "Linksom draaien"
 
 #: cps/templates/readcbr.html:99
 msgid "Flip Image"

From 41a3623fcc791c85715a5fe65554bfa89ce3869c Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Thu, 12 Mar 2020 19:31:42 -0400
Subject: [PATCH 19/38] [Kobo] Add Shelf/Collection support.

Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
---
 cps/kobo.py               | 254 +++++++++++++++++++++++++++++++++++---
 cps/opds.py               |   4 +-
 cps/services/SyncToken.py |  11 +-
 cps/shelf.py              |  99 +++++++--------
 cps/ub.py                 |  38 +++++-
 5 files changed, 325 insertions(+), 81 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index 6b70bdf5..ee0aa810 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -17,9 +17,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import base64
 import datetime
+import itertools
+import json
 import sys
-import base64
 import os
 import uuid
 from time import gmtime, strftime
@@ -45,7 +47,7 @@ from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
 import requests
 
-from . import config, logger, kobo_auth, db, helper, ub
+from . import config, logger, kobo_auth, db, helper, shelf as shelf_lib, ub
 from .services import SyncToken as SyncToken
 from .web import download_required
 from .kobo_auth import requires_kobo_auth
@@ -120,6 +122,7 @@ def redirect_or_proxy_request():
 def convert_to_kobo_timestamp_string(timestamp):
     return timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
 
+
 @kobo.route("/v1/library/sync")
 @requires_kobo_auth
 @download_required
@@ -203,24 +206,23 @@ def HandleSyncRequest():
                      ub.KoboReadingState.user_id == current_user.id,
                      ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements))))
     for kobo_reading_state in changed_reading_states.all():
-        book = db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one()
-        sync_results.append({
-            "ChangedReadingState": {
-                "ReadingState": get_kobo_reading_state_response(book, kobo_reading_state)
-            }
-        })
-        new_reading_state_last_modified = max(new_reading_state_last_modified, kobo_reading_state.last_modified)
+        book = db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one_or_none()
+        if book:
+            sync_results.append({
+                "ChangedReadingState": {
+                    "ReadingState": get_kobo_reading_state_response(book, kobo_reading_state)
+                }
+            })
+            new_reading_state_last_modified = max(new_reading_state_last_modified, kobo_reading_state.last_modified)
+
+    sync_shelves(sync_token, sync_results)
 
     sync_token.books_last_created = new_books_last_created
     sync_token.books_last_modified = new_books_last_modified
     sync_token.archive_last_modified = new_archived_last_modified
     sync_token.reading_state_last_modified = new_reading_state_last_modified
 
-    if config.config_kobo_proxy:
-        return generate_sync_response(request, sync_token, sync_results)
-
-    return make_response(jsonify(sync_results))
-    # Missing feature: Detect server-side book deletions.
+    return generate_sync_response(request, sync_token, sync_results)
 
 
 def generate_sync_response(request, sync_token, sync_results):
@@ -392,6 +394,222 @@ def get_metadata(book):
     return metadata
 
 
+@kobo.route("/v1/library/tags", methods=["POST"])
+@login_required
+# Creates a Shelf with the given items, and returns the shelf's uuid.
+def HandleTagCreate():
+    shelf_request = request.json
+    name, items = None, None
+    try:
+        name = shelf_request["Name"]
+        items = shelf_request["Items"]
+    except KeyError:
+        log.debug("Received malformed v1/library/tags request.")
+        abort(400, description="Malformed tags POST request. Data is missing 'Name' or 'Items' field")
+
+    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.name) == name, ub.Shelf.user_id ==
+                                              current_user.id).one_or_none()
+    if shelf and not shelf_lib.check_shelf_edit_permissions(shelf):
+        abort(401, description="User is unauthaurized to edit shelf.")
+
+    if not shelf:
+        shelf = ub.Shelf(user_id=current_user.id, name=name, uuid=uuid.uuid4())
+        ub.session.add(shelf)
+
+    items_unknown_to_calibre = add_items_to_shelf(items, shelf)
+    if items_unknown_to_calibre:
+        log.debug("Received request to add unknown books to a collection. Silently ignoring items.")
+    ub.session.commit()
+
+    return make_response(jsonify(str(shelf.uuid)), 201)
+
+
+@kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE", "PUT"])
+def HandleTagUpdate(tag_id):
+    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.uuid) == tag_id,
+                                              ub.Shelf.user_id == current_user.id).one_or_none()
+    if not shelf:
+        log.debug("Received Kobo tag update request on a collection unknown to CalibreWeb")
+        if config.config_kobo_proxy:
+            return redirect_or_proxy_request()
+        else:
+            abort(404, description="Collection isn't known to CalibreWeb")
+
+    if not shelf_lib.check_shelf_edit_permissions(shelf):
+        abort(401, description="User is unauthaurized to edit shelf.")
+
+    if request.method == "DELETE":
+        shelf_lib.delete_shelf_helper(shelf)
+    else:
+        shelf_request = request.json
+        name = None
+        try:
+            name = shelf_request["Name"]
+        except KeyError:
+            log.debug("Received malformed v1/library/tags rename request.")
+            abort(400, description="Malformed tags POST request. Data is missing 'Name' field")
+
+        shelf.name = name
+        ub.session.merge(shelf)
+        ub.session.commit()
+
+    return make_response(' ', 200)
+
+
+# Adds items to the given shelf.
+def add_items_to_shelf(items, shelf):
+    book_ids_already_in_shelf = set([book_shelf.book_id for book_shelf in shelf.books])
+    items_unknown_to_calibre = []
+    for item in items:
+        if item["Type"] != "ProductRevisionTagItem":
+            items_unknown_to_calibre.append(item)
+            continue
+
+        book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
+        if not book:
+            items_unknown_to_calibre.append(item)
+            continue
+
+        book_id = book.id
+        if book_id not in book_ids_already_in_shelf:
+            shelf.books.append(ub.BookShelf(book_id=book_id))
+    return items_unknown_to_calibre
+
+
+@kobo.route("/v1/library/tags/<tag_id>/items", methods=["POST"])
+@login_required
+def HandleTagAddItem(tag_id):
+    tag_request = request.json
+    items = None
+    try:
+        items = tag_request["Items"]
+    except KeyError:
+        log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
+        abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
+
+    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.uuid) == tag_id,
+                                              ub.Shelf.user_id == current_user.id).one_or_none()
+    if not shelf:
+        log.debug("Received Kobo request on a collection unknown to CalibreWeb")
+        abort(404, description="Collection isn't known to CalibreWeb")
+
+    if not shelf_lib.check_shelf_edit_permissions(shelf):
+        abort(401, description="User is unauthaurized to edit shelf.")
+
+    items_unknown_to_calibre = add_items_to_shelf(items, shelf)
+    if items_unknown_to_calibre:
+        log.debug("Received request to add an unknown book to a collecition. Silently ignoring item.")
+
+    ub.session.merge(shelf)
+    ub.session.commit()
+
+    return make_response('', 201)
+
+
+@kobo.route("/v1/library/tags/<tag_id>/items/delete", methods=["POST"])
+@login_required
+def HandleTagRemoveItem(tag_id):
+    tag_request = request.json
+    items = None
+    try:
+        items = tag_request["Items"]
+    except KeyError:
+        log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
+        abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
+
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.uuid == tag_id,
+                                              ub.Shelf.user_id == current_user.id).one_or_none()
+    if not shelf:
+        log.debug(
+            "Received a request to remove an item from a Collection unknown to CalibreWeb.")
+        abort(404, description="Collection isn't known to CalibreWeb")
+
+    if not shelf_lib.check_shelf_edit_permissions(shelf):
+        abort(401, description="User is unauthaurized to edit shelf.")
+
+    items_unknown_to_calibre = []
+    for item in items:
+        if item["Type"] != "ProductRevisionTagItem":
+            items_unknown_to_calibre.append(item)
+            continue
+
+        book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
+        if not book:
+            items_unknown_to_calibre.append(item)
+            continue
+
+        shelf.books.filter(ub.BookShelf.book_id == book.id).delete()
+    ub.session.commit()
+
+    if items_unknown_to_calibre:
+        log.debug("Received request to remove an unknown book to a collecition. Silently ignoring item.")
+
+    return make_response('', 200)
+
+
+# Add new, changed, or deleted shelves to the sync_results.
+# Note: Public shelves that aren't owned by the user aren't supported.
+def sync_shelves(sync_token, sync_results):
+    new_tags_last_modified = sync_token.tags_last_modified
+
+    for shelf in ub.session.query(ub.ShelfArchive).filter(func.datetime(ub.ShelfArchive.last_modified) > sync_token.tags_last_modified, ub.ShelfArchive.user_id == current_user.id):
+        new_tags_last_modified = max(shelf.last_modified, new_tags_last_modified)
+
+        sync_results.append({
+            "DeletedTag": {
+                "Tag": {
+                    "Id": shelf.uuid,
+                    "LastModified": convert_to_kobo_timestamp_string(shelf.last_modified)
+                }
+            }
+        })
+
+    for shelf in ub.session.query(ub.Shelf).filter(func.datetime(ub.Shelf.last_modified) > sync_token.tags_last_modified, ub.Shelf.user_id == current_user.id):
+        if not shelf_lib.check_shelf_view_permissions(shelf):
+            continue
+
+        new_tags_last_modified = max(shelf.last_modified, new_tags_last_modified)
+
+        tag = create_kobo_tag(shelf)
+        if not tag:
+            continue
+
+        if shelf.created > sync_token.tags_last_modified:
+            sync_results.append({
+                "NewTag": tag
+            })
+        else:
+            sync_results.append({
+                "ChangedTag": tag
+            })
+    sync_token.tags_last_modified = new_tags_last_modified
+    ub.session.commit()
+
+
+# Creates a Kobo "Tag" object from a ub.Shelf object
+def create_kobo_tag(shelf):
+    tag = {
+        "Created": convert_to_kobo_timestamp_string(shelf.created),
+        "Id": shelf.uuid,
+        "Items": [],
+        "LastModified": convert_to_kobo_timestamp_string(shelf.last_modified),
+        "Name": shelf.name,
+        "Type": "UserTag"
+    }
+    for book_shelf in shelf.books:
+        book = db.session.query(db.Books).filter(db.Books.id == book_shelf.book_id).one_or_none()
+        if not book:
+            log.info(u"Book (id: %s) in BookShelf (id: %s) not found in book database",  book_shelf.book_id, shelf.id)
+            return None
+        tag["Items"].append(
+            {
+                "RevisionId": book.uuid,
+                "Type": "ProductRevisionTagItem"
+            }
+        )
+    return {"Tag": tag}
+
+
 @kobo.route("/v1/library/<book_uuid>/state", methods=["GET", "PUT"])
 @login_required
 def HandleStateRequest(book_uuid):
@@ -589,10 +807,7 @@ def HandleBookDeletionRequest(book_uuid):
 
 # TODO: Implement the following routes
 @kobo.route("/v1/library/<dummy>", methods=["DELETE", "GET"])
-@kobo.route("/v1/library/tags", methods=["POST"])
-@kobo.route("/v1/library/tags/<shelf_name>", methods=["POST"])
-@kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE"])
-def HandleUnimplementedRequest(dummy=None, book_uuid=None, shelf_name=None, tag_id=None):
+def HandleUnimplementedRequest(dummy=None):
     log.debug("Unimplemented Library Request received: %s", request.base_url)
     return redirect_or_proxy_request()
 
@@ -612,6 +827,7 @@ def HandleUserRequest(dummy=None):
 @kobo.route("/v1/products/<dummy>/recommendations", methods=["GET", "POST"])
 @kobo.route("/v1/products/<dummy>/nextread", methods=["GET", "POST"])
 @kobo.route("/v1/products/<dummy>/reviews", methods=["GET", "POST"])
+@kobo.route("/v1/products/books/series/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/products/books/<dummy>", methods=["GET", "POST"])
 @kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
 @kobo.route("/v1/products", methods=["GET", "POST"])
@@ -624,7 +840,7 @@ def HandleProductsRequest(dummy=None):
 def handle_404(err):
     # This handler acts as a catch-all for endpoints that we don't have an interest in
     # implementing (e.g: v1/analytics/gettests, v1/user/recommendations, etc)
-    log.debug("Unknown Request received: %s", request.base_url)
+    log.debug("Unknown Request received: %s, method: %s, data: %s", request.base_url, request.method, request.data)
     return redirect_or_proxy_request()
 
 
diff --git a/cps/opds.py b/cps/opds.py
index 5cfb5348..8877cfb2 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -326,12 +326,12 @@ def feed_shelfindex():
 def feed_shelf(book_id):
     off = request.args.get("offset") or 0
     if current_user.is_anonymous:
-        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == book_id).first()
+        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == book_id, not ub.Shelf.deleted).first()
     else:
         shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
                                                            ub.Shelf.id == book_id),
                                                       and_(ub.Shelf.is_public == 1,
-                                                           ub.Shelf.id == book_id))).first()
+                                                           ub.Shelf.id == book_id)), not ub.Shelf.deleted).first()
     result = list()
     # user is allowed to access shelf
     if shelf:
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 9804fdb3..abc639f1 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -78,6 +78,7 @@ class SyncToken():
             "books_last_created": {"type": "string"},
             "archive_last_modified": {"type": "string"},
             "reading_state_last_modified": {"type": "string"},
+            "tags_last_modified": {"type": "string"},
         },
     }
 
@@ -88,13 +89,14 @@ class SyncToken():
         books_last_modified=datetime.min,
         archive_last_modified=datetime.min,
         reading_state_last_modified=datetime.min,
+        tags_last_modified=datetime.min,
     ):
         self.raw_kobo_store_token = raw_kobo_store_token
         self.books_last_created = books_last_created
         self.books_last_modified = books_last_modified
         self.archive_last_modified = archive_last_modified
         self.reading_state_last_modified = reading_state_last_modified
-
+        self.tags_last_modified = tags_last_modified
 
     @staticmethod
     def from_headers(headers):
@@ -128,6 +130,7 @@ class SyncToken():
             books_last_created = get_datetime_from_json(data_json, "books_last_created")
             archive_last_modified = get_datetime_from_json(data_json, "archive_last_modified")
             reading_state_last_modified = get_datetime_from_json(data_json, "reading_state_last_modified")
+            tags_last_modified = get_datetime_from_json(data_json, "tags_last_modified")
         except TypeError:
             log.error("SyncToken timestamps don't parse to a datetime.")
             return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
@@ -137,7 +140,8 @@ class SyncToken():
             books_last_created=books_last_created,
             books_last_modified=books_last_modified,
             archive_last_modified=archive_last_modified,
-            reading_state_last_modified=reading_state_last_modified
+            reading_state_last_modified=reading_state_last_modified,
+            tags_last_modified=tags_last_modified
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -159,7 +163,8 @@ class SyncToken():
                 "books_last_modified": to_epoch_timestamp(self.books_last_modified),
                 "books_last_created": to_epoch_timestamp(self.books_last_created),
                 "archive_last_modified": to_epoch_timestamp(self.archive_last_modified),
-                "reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified)
+                "reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified),
+                "tags_last_modified": to_epoch_timestamp(self.tags_last_modified)
             },
         }
         return b64encode_json(token)
diff --git a/cps/shelf.py b/cps/shelf.py
index c78059ca..4924a186 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -35,6 +35,24 @@ from .helper import common_filters
 shelf = Blueprint('shelf', __name__)
 log = logger.create()
 
+def check_shelf_edit_permissions(cur_shelf):
+    if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
+        log.error("User %s not allowed to edit shelf %s", current_user, cur_shelf)
+        return False
+    if cur_shelf.is_public and not current_user.role_edit_shelfs():
+        log.info("User %s not allowed to edit public shelves", current_user)
+        return False
+    return True
+
+
+def check_shelf_view_permissions(cur_shelf):
+    if cur_shelf.is_public:
+        return True
+    if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
+        log.error("User is unauthorized to view non-public shelf: %s", cur_shelf)
+        return False
+    return True
+
 
 @shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>")
 @login_required
@@ -48,21 +66,13 @@ def add_to_shelf(shelf_id, book_id):
             return redirect(url_for('web.index'))
         return "Invalid shelf specified", 400
 
-    if not shelf.is_public and not shelf.user_id == int(current_user.id):
-        log.error("User %s not allowed to add a book to %s", current_user, shelf)
+    if not check_shelf_edit_permissions(shelf):
         if not xhr:
             flash(_(u"Sorry you are not allowed to add a book to the the shelf: %(shelfname)s", shelfname=shelf.name),
                   category="error")
             return redirect(url_for('web.index'))
         return "Sorry you are not allowed to add a book to the the shelf: %s" % shelf.name, 403
 
-    if shelf.is_public and not current_user.role_edit_shelfs():
-        log.info("User %s not allowed to edit public shelves", current_user)
-        if not xhr:
-            flash(_(u"You are not allowed to edit public shelves"), category="error")
-            return redirect(url_for('web.index'))
-        return "User is not allowed to edit public shelves", 403
-
     book_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
                                           ub.BookShelf.book_id == book_id).first()
     if book_in_shelf:
@@ -78,8 +88,8 @@ def add_to_shelf(shelf_id, book_id):
     else:
         maxOrder = maxOrder[0]
 
-    ins = ub.BookShelf(shelf=shelf.id, book_id=book_id, order=maxOrder + 1)
-    ub.session.add(ins)
+    shelf.books.append(ub.BookShelf(shelf=shelf.id, book_id=book_id, order=maxOrder + 1))
+    ub.session.merge(shelf)
     ub.session.commit()
     if not xhr:
         flash(_(u"Book has been added to shelf: %(sname)s", sname=shelf.name), category="success")
@@ -99,16 +109,10 @@ def search_to_shelf(shelf_id):
         flash(_(u"Invalid shelf specified"), category="error")
         return redirect(url_for('web.index'))
 
-    if not shelf.is_public and not shelf.user_id == int(current_user.id):
-        log.error("User %s not allowed to add a book to %s", current_user, shelf)
+    if not check_shelf_edit_permissions(shelf):
         flash(_(u"You are not allowed to add a book to the the shelf: %(name)s", name=shelf.name), category="error")
         return redirect(url_for('web.index'))
 
-    if shelf.is_public and not current_user.role_edit_shelfs():
-        log.error("User %s not allowed to edit public shelves", current_user)
-        flash(_(u"User is not allowed to edit public shelves"), category="error")
-        return redirect(url_for('web.index'))
-
     if current_user.id in searched_ids and searched_ids[current_user.id]:
         books_for_shelf = list()
         books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).all()
@@ -135,8 +139,8 @@ def search_to_shelf(shelf_id):
 
         for book in books_for_shelf:
             maxOrder = maxOrder + 1
-            ins = ub.BookShelf(shelf=shelf.id, book_id=book, order=maxOrder)
-            ub.session.add(ins)
+            shelf.books.append(ub.BookShelf(shelf=shelf.id, book_id=book, order=maxOrder))
+        ub.session.merge(shelf)
         ub.session.commit()
         flash(_(u"Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
     else:
@@ -163,8 +167,7 @@ def remove_from_shelf(shelf_id, book_id):
     #   true         0             x             1
     #   false        0             x             0
 
-    if (not shelf.is_public and shelf.user_id == int(current_user.id)) \
-            or (shelf.is_public and current_user.role_edit_shelfs()):
+    if check_shelf_edit_permissions(shelf):
         book_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
                                                            ub.BookShelf.book_id == book_id).first()
 
@@ -185,7 +188,6 @@ def remove_from_shelf(shelf_id, book_id):
                 return redirect(url_for('web.index'))
         return "", 204
     else:
-        log.error("User %s not allowed to remove a book from %s", current_user, shelf)
         if not xhr:
             flash(_(u"Sorry you are not allowed to remove a book from this shelf: %(sname)s", sname=shelf.name),
                   category="error")
@@ -238,7 +240,7 @@ def create_shelf():
 @login_required
 def edit_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    if request.method == "POST":
+    if request.method == "POST":            
         to_save = request.form.to_dict()
 
         is_shelf_name_unique = False
@@ -275,41 +277,33 @@ def edit_shelf(shelf_id):
         return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
 
 
+def delete_shelf_helper(cur_shelf):
+    if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
+        return
+    shelf_id = cur_shelf.id
+    ub.session.delete(cur_shelf)
+    ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
+    ub.session.add(ub.ShelfArchive(uuid = cur_shelf.uuid, user_id = cur_shelf.uuid))
+    ub.session.commit()
+    log.info("successfully deleted %s", cur_shelf)
+
+
 @shelf.route("/shelf/delete/<int:shelf_id>")
 @login_required
 def delete_shelf(shelf_id):
     cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    deleted = None
-    if current_user.role_admin():
-        deleted = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).delete()
-    else:
-        if (not cur_shelf.is_public and cur_shelf.user_id == int(current_user.id)) \
-                or (cur_shelf.is_public and current_user.role_edit_shelfs()):
-            deleted = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
-                                                                 ub.Shelf.id == shelf_id),
-                                                            and_(ub.Shelf.is_public == 1,
-                                                                 ub.Shelf.id == shelf_id))).delete()
-
-    if deleted:
-        ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
-        ub.session.commit()
-        log.info("successfully deleted %s", cur_shelf)
+    delete_shelf_helper(cur_shelf)
     return redirect(url_for('web.index'))
 
 # @shelf.route("/shelfdown/<int:shelf_id>")
 @shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1})
 @shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>")
 def show_shelf(shelf_type, shelf_id):
-    if current_user.is_anonymous:
-        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == shelf_id).first()
-    else:
-        shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
-                                                           ub.Shelf.id == shelf_id),
-                                                      and_(ub.Shelf.is_public == 1,
-                                                           ub.Shelf.id == shelf_id))).first()
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+
     result = list()
     # user is allowed to access shelf
-    if shelf:
+    if shelf and check_shelf_view_permissions(shelf):
         page = "shelf.html" if shelf_type == 1 else 'shelfdown.html'
 
         books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id)\
@@ -344,15 +338,10 @@ def order_shelf(shelf_id):
             setattr(book, 'order', to_save[str(book.book_id)])
             counter += 1
         ub.session.commit()
-    if current_user.is_anonymous:
-        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == shelf_id).first()
-    else:
-        shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
-                                                           ub.Shelf.id == shelf_id),
-                                                      and_(ub.Shelf.is_public == 1,
-                                                           ub.Shelf.id == shelf_id))).first()
+
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     result = list()
-    if shelf:
+    if shelf and check_shelf_view_permissions(shelf):
         books_in_shelf2 = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id) \
             .order_by(ub.BookShelf.order.asc()).all()
         for book in books_in_shelf2:
diff --git a/cps/ub.py b/cps/ub.py
index dbefe217..fbc67629 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -21,6 +21,7 @@ from __future__ import division, print_function, unicode_literals
 import os
 import datetime
 import itertools
+import uuid
 from binascii import hexlify
 
 from flask import g
@@ -35,8 +36,8 @@ except ImportError:
 from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float
-from sqlalchemy.orm import backref, foreign, relationship, remote, sessionmaker, Session
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import backref, foreign, relationship, remote, sessionmaker, Session
 from sqlalchemy.sql.expression import and_
 from werkzeug.security import generate_password_hash
 
@@ -265,9 +266,13 @@ class Shelf(Base):
     __tablename__ = 'shelf'
 
     id = Column(Integer, primary_key=True)
+    uuid = Column(String, default=lambda : str(uuid.uuid4()))
     name = Column(String)
     is_public = Column(Integer, default=0)
     user_id = Column(Integer, ForeignKey('user.id'))
+    books = relationship("BookShelf", backref="ub_shelf", cascade="all, delete-orphan", lazy="dynamic")
+    created = Column(DateTime, default=datetime.datetime.utcnow)
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
 
     def __repr__(self):
         return '<Shelf %d:%r>' % (self.id, self.name)
@@ -281,11 +286,22 @@ class BookShelf(Base):
     book_id = Column(Integer)
     order = Column(Integer)
     shelf = Column(Integer, ForeignKey('shelf.id'))
+    date_added = Column(DateTime, default=datetime.datetime.utcnow)
 
     def __repr__(self):
         return '<Book %r>' % self.id
 
 
+# This table keeps track of deleted Shelves so that deletes can be propagated to any paired Kobo device.
+class ShelfArchive(Base):
+    __tablename__ = 'shelf_archive'
+
+    id = Column(Integer, primary_key=True)
+    uuid = Column(String)
+    user_id = Column(Integer, ForeignKey('user.id'))
+    last_modified = Column(DateTime, default=datetime.datetime.utcnow)
+
+
 class ReadBook(Base):
     __tablename__ = 'book_read_link'
 
@@ -370,6 +386,10 @@ def receive_before_flush(session, flush_context, instances):
         if isinstance(change, (ReadBook, KoboStatistics, KoboBookmark)):
             if change.kobo_reading_state:
                 change.kobo_reading_state.last_modified = datetime.datetime.utcnow()
+    # Maintain the last_modified bit for the Shelf table.
+    for change in itertools.chain(session.new, session.deleted):
+        if isinstance(change, BookShelf):
+            change.ub_shelf.last_modified = datetime.datetime.utcnow()
 
 
 # Baseclass representing Downloads from calibre-web in app.db
@@ -463,7 +483,21 @@ def migrate_Database(session):
         conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
         conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")    
         session.commit()
-
+    try:
+        session.query(exists().where(Shelf.uuid)).scalar()
+    except exc.OperationalError:
+        conn = engine.connect()
+        conn.execute("ALTER TABLE shelf ADD column 'uuid' STRING")
+        conn.execute("ALTER TABLE shelf ADD column 'created' DATETIME")
+        conn.execute("ALTER TABLE shelf ADD column 'last_modified' DATETIME")
+        conn.execute("ALTER TABLE book_shelf_link ADD column 'date_added' DATETIME")
+        for shelf in session.query(Shelf).all():
+            shelf.uuid = str(uuid.uuid4())
+            shelf.created = datetime.datetime.now()
+            shelf.last_modified = datetime.datetime.now()
+        for book_shelf in session.query(BookShelf).all():
+            book_shelf.date_added = datetime.datetime.now()
+        session.commit()
     # Handle table exists, but no content
     cnt = session.query(Registration).count()
     if not cnt:

From 24c743d23dae99358f068f453a5f76f7e3f87aad Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 19 Apr 2020 19:08:58 +0200
Subject: [PATCH 20/38] Code cosmetics

---
 cps/cli.py                |   2 +-
 cps/db.py                 |   2 +-
 cps/helper.py             | 136 +++++++++++++++++++++++---------------
 cps/jinjia.py             |   6 +-
 cps/kobo.py               |  17 +++--
 cps/logger.py             |   2 +-
 cps/oauth.py              |   4 +-
 cps/opds.py               |  64 ++++++++++++------
 cps/server.py             |   4 +-
 cps/services/SyncToken.py |  12 ++--
 cps/shelf.py              |  59 +++++++++--------
 cps/subproc_wrapper.py    |  10 +--
 cps/templates/list.html   |  12 ++--
 cps/ub.py                 | 114 +++++++++++++++++---------------
 cps/updater.py            |  10 +--
 15 files changed, 262 insertions(+), 192 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 8d410a90..c94cb89d 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -34,7 +34,7 @@ def version_info():
 
 
 parser = argparse.ArgumentParser(description='Calibre Web is a web app'
-                    ' providing a interface for browsing, reading and downloading eBooks\n', prog='cps.py')
+                                 ' providing a interface for browsing, reading and downloading eBooks\n', prog='cps.py')
 parser.add_argument('-p', metavar='path', help='path and name to settings db, e.g. /opt/cw.db')
 parser.add_argument('-g', metavar='path', help='path and name to gdrive db, e.g. /opt/gd.db')
 parser.add_argument('-c', metavar='path',
diff --git a/cps/db.py b/cps/db.py
index 966adbe5..6da36b85 100755
--- a/cps/db.py
+++ b/cps/db.py
@@ -25,7 +25,7 @@ import ast
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey
-from sqlalchemy import String, Integer, Boolean, TIMESTAMP, Float
+from sqlalchemy import String, Integer, Boolean, TIMESTAMP, Float, DateTime
 from sqlalchemy.orm import relationship, sessionmaker, scoped_session
 from sqlalchemy.ext.declarative import declarative_base
 
diff --git a/cps/helper.py b/cps/helper.py
index b80aa862..f8d6efd3 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -96,7 +96,7 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
         # read settings and append converter task to queue
         if kindle_mail:
             settings = config.get_mail_settings()
-            settings['subject'] = _('Send to Kindle') # pretranslate Subject for e-mail
+            settings['subject'] = _('Send to Kindle')  # pretranslate Subject for e-mail
             settings['body'] = _(u'This e-mail has been sent via Calibre-Web.')
             # text = _(u"%(format)s: %(book)s", format=new_book_format, book=book.title)
         else:
@@ -108,7 +108,7 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
         return None
     else:
         error_message = _(u"%(format)s not found: %(fn)s",
-                        format=old_book_format, fn=data.name + "." + old_book_format.lower())
+                          format=old_book_format, fn=data.name + "." + old_book_format.lower())
         return error_message
 
 
@@ -141,36 +141,52 @@ def check_send_to_kindle(entry):
         returns all available book formats for sending to Kindle
     """
     if len(entry.data):
-        bookformats=list()
+        bookformats = list()
         if config.config_ebookconverter == 0:
             # no converter - only for mobi and pdf formats
             for ele in iter(entry.data):
                 if 'MOBI' in ele.format:
-                    bookformats.append({'format':'Mobi','convert':0,'text':_('Send %(format)s to Kindle',format='Mobi')})
+                    bookformats.append({'format': 'Mobi',
+                                        'convert': 0,
+                                        'text': _('Send %(format)s to Kindle', format='Mobi')})
                 if 'PDF' in ele.format:
-                    bookformats.append({'format':'Pdf','convert':0,'text':_('Send %(format)s to Kindle',format='Pdf')})
+                    bookformats.append({'format': 'Pdf',
+                                        'convert': 0,
+                                        'text': _('Send %(format)s to Kindle', format='Pdf')})
                 if 'AZW' in ele.format:
-                    bookformats.append({'format':'Azw','convert':0,'text':_('Send %(format)s to Kindle',format='Azw')})
-                '''if 'AZW3' in ele.format:
-                    bookformats.append({'format':'Azw3','convert':0,'text':_('Send %(format)s to Kindle',format='Azw3')})'''
+                    bookformats.append({'format': 'Azw',
+                                        'convert': 0,
+                                        'text': _('Send %(format)s to Kindle', format='Azw')})
         else:
             formats = list()
             for ele in iter(entry.data):
                 formats.append(ele.format)
             if 'MOBI' in formats:
-                bookformats.append({'format': 'Mobi','convert':0,'text':_('Send %(format)s to Kindle',format='Mobi')})
+                bookformats.append({'format': 'Mobi',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Mobi')})
             if 'AZW' in formats:
-                bookformats.append({'format': 'Azw','convert':0,'text':_('Send %(format)s to Kindle',format='Azw')})
+                bookformats.append({'format': 'Azw',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Azw')})
             if 'PDF' in formats:
-                bookformats.append({'format': 'Pdf','convert':0,'text':_('Send %(format)s to Kindle',format='Pdf')})
+                bookformats.append({'format': 'Pdf',
+                                    'convert': 0,
+                                    'text': _('Send %(format)s to Kindle', format='Pdf')})
             if config.config_ebookconverter >= 1:
                 if 'EPUB' in formats and not 'MOBI' in formats:
-                    bookformats.append({'format': 'Mobi','convert':1,
-                            'text':_('Convert %(orig)s to %(format)s and send to Kindle',orig='Epub',format='Mobi')})
+                    bookformats.append({'format': 'Mobi',
+                                        'convert':1,
+                                        'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                                  orig='Epub',
+                                                  format='Mobi')})
             if config.config_ebookconverter == 2:
                 if 'AZW3' in formats and not 'MOBI' in formats:
-                    bookformats.append({'format': 'Mobi','convert':2,
-                            'text':_('Convert %(orig)s to %(format)s and send to Kindle',orig='Azw3',format='Mobi')})
+                    bookformats.append({'format': 'Mobi',
+                                        'convert': 2,
+                                        'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                                  orig='Azw3',
+                                                  format='Mobi')})
         return bookformats
     else:
         log.error(u'Cannot find book entry %d', entry.id)
@@ -204,7 +220,6 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
         # returns None if success, otherwise errormessage
         return convert_book_format(book_id, calibrepath, u'azw3', book_format.lower(), user_id, kindle_mail)
 
-
     for entry in iter(book.data):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
@@ -369,7 +384,7 @@ def update_dir_structure_gdrive(book_id, first_author):
             path = book.path
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=book.path) # file not found
+            error = _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
@@ -379,7 +394,7 @@ def update_dir_structure_gdrive(book_id, first_author):
             path = book.path
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir) # file not found
+            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     # Rename all files from old names to new names
 
     if authordir != new_authordir or titledir != new_titledir:
@@ -395,7 +410,7 @@ def update_dir_structure_gdrive(book_id, first_author):
 
 
 def delete_book_gdrive(book, book_format):
-    error= False
+    error = False
     if book_format:
         name = ''
         for entry in book.data:
@@ -403,12 +418,12 @@ def delete_book_gdrive(book, book_format):
                 name = entry.name + '.' + book_format
         gFile = gd.getFileFromEbooksFolder(book.path, name)
     else:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path),book.path.split('/')[1])
+        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), book.path.split('/')[1])
     if gFile:
         gd.deleteDatabaseEntry(gFile['id'])
         gFile.Trash()
     else:
-        error =_(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
+        error = _(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
     return error
 
 
@@ -417,24 +432,25 @@ def reset_password(user_id):
     password = generate_random_password()
     existing_user.password = generate_password_hash(password)
     if not config.get_mail_server_configured():
-        return (2, None)
+        return 2, None
     try:
         ub.session.commit()
         send_registration_mail(existing_user.email, existing_user.nickname, password, True)
-        return (1, existing_user.nickname)
+        return 1, existing_user.nickname
     except Exception:
         ub.session.rollback()
-        return (0, None)
+        return 0, None
 
 
 def generate_random_password():
     s = "abcdefghijklmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%&*()?"
     passlen = 8
-    return "".join(random.sample(s,passlen ))
+    return "".join(random.sample(s, passlen))
 
 ################################## External interface
 
-def update_dir_stucture(book_id, calibrepath, first_author = None):
+
+def update_dir_stucture(book_id, calibrepath, first_author=None):
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author)
     else:
@@ -454,23 +470,26 @@ def get_cover_on_failure(use_generic_cover):
     else:
         return None
 
+
 def get_book_cover(book_id):
     book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
     return get_book_cover_internal(book, use_generic_cover_on_failure=True)
 
+
 def get_book_cover_with_uuid(book_uuid,
-                   use_generic_cover_on_failure=True):
+                             use_generic_cover_on_failure=True):
     book = db.session.query(db.Books).filter(db.Books.uuid == book_uuid).first()
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
+
 def get_book_cover_internal(book,
-                   use_generic_cover_on_failure):
+                            use_generic_cover_on_failure):
     if book and book.has_cover:
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
                     return get_cover_on_failure(use_generic_cover_on_failure)
-                path=gd.get_cover_via_gdrive(book.path)
+                path = gd.get_cover_via_gdrive(book.path)
                 if path:
                     return redirect(path)
                 else:
@@ -530,7 +549,7 @@ def save_cover(img, book_path):
             return False, _("Only jpg/jpeg/png/webp files are supported as coverfile")
         # convert to jpg because calibre only supports jpg
         if content_type in ('image/png', 'image/webp'):
-            if hasattr(img,'stream'):
+            if hasattr(img, 'stream'):
                 imgc = PILImage.open(img.stream)
             else:
                 imgc = PILImage.open(io.BytesIO(img.content))
@@ -539,7 +558,7 @@ def save_cover(img, book_path):
             im.save(tmp_bytesio, format='JPEG')
             img._content = tmp_bytesio.getvalue()
     else:
-        if content_type not in ('image/jpeg'):
+        if content_type not in 'image/jpeg':
             log.error("Only jpg/jpeg files are supported as coverfile")
             return False, _("Only jpg/jpeg files are supported as coverfile")
 
@@ -557,7 +576,6 @@ def save_cover(img, book_path):
         return save_cover_from_filestorage(os.path.join(config.config_calibre_dir, book_path), "cover.jpg", img)
 
 
-
 def do_download_file(book, book_format, data, headers):
     if config.config_use_google_drive:
         startTime = time.time()
@@ -579,7 +597,6 @@ def do_download_file(book, book_format, data, headers):
 ##################################
 
 
-
 def check_unrar(unrarLocation):
     if not unrarLocation:
         return
@@ -601,13 +618,12 @@ def check_unrar(unrarLocation):
         return 'Error excecuting UnRar'
 
 
-
 def json_serial(obj):
     """JSON serializer for objects not serializable by default json code"""
 
-    if isinstance(obj, (datetime)):
+    if isinstance(obj, datetime):
         return obj.isoformat()
-    if isinstance(obj, (timedelta)):
+    if isinstance(obj, timedelta):
         return {
             '__type__': 'timedelta',
             'days': obj.days,
@@ -615,7 +631,7 @@ def json_serial(obj):
             'microseconds': obj.microseconds,
         }
         # return obj.isoformat()
-    raise TypeError ("Type %s not serializable" % type(obj))
+    raise TypeError("Type %s not serializable" % type(obj))
 
 
 # helper function for displaying the runtime of tasks
@@ -637,7 +653,7 @@ def format_runtime(runtime):
 
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
-    renderedtasklist=list()
+    renderedtasklist = list()
     for task in tasklist:
         if task['user'] == current_user.nickname or current_user.role_admin():
             if task['formStarttime']:
@@ -653,7 +669,7 @@ def render_task_status(tasklist):
                 task['runtime'] = format_runtime(task['formRuntime'])
 
             # localize the task status
-            if isinstance( task['stat'], int ):
+            if isinstance( task['stat'], int):
                 if task['stat'] == STAT_WAITING:
                     task['status'] = _(u'Waiting')
                 elif task['stat'] == STAT_FAIL:
@@ -666,14 +682,14 @@ def render_task_status(tasklist):
                     task['status'] = _(u'Unknown Status')
 
             # localize the task type
-            if isinstance( task['taskType'], int ):
+            if isinstance( task['taskType'], int):
                 if task['taskType'] == TASK_EMAIL:
                     task['taskMessage'] = _(u'E-mail: ') + task['taskMess']
-                elif  task['taskType'] == TASK_CONVERT:
+                elif task['taskType'] == TASK_CONVERT:
                     task['taskMessage'] = _(u'Convert: ') + task['taskMess']
-                elif  task['taskType'] == TASK_UPLOAD:
+                elif task['taskType'] == TASK_UPLOAD:
                     task['taskMessage'] = _(u'Upload: ') + task['taskMess']
-                elif  task['taskType'] == TASK_CONVERT_ANY:
+                elif task['taskType'] == TASK_CONVERT_ANY:
                     task['taskMessage'] = _(u'Convert: ') + task['taskMess']
                 else:
                     task['taskMessage'] = _(u'Unknown Task: ') + task['taskMess']
@@ -709,11 +725,11 @@ def common_filters(allow_show_archived=False):
         pos_cc_list = current_user.allowed_column_value.split(',')
         pos_content_cc_filter = true() if pos_cc_list == [''] else \
             getattr(db.Books, 'custom_column_' + str(config.config_restricted_column)).\
-                any(db.cc_classes[config.config_restricted_column].value.in_(pos_cc_list))
+                    any(db.cc_classes[config.config_restricted_column].value.in_(pos_cc_list))
         neg_cc_list = current_user.denied_column_value.split(',')
         neg_content_cc_filter = false() if neg_cc_list == [''] else \
             getattr(db.Books, 'custom_column_' + str(config.config_restricted_column)).\
-                any(db.cc_classes[config.config_restricted_column].value.in_(neg_cc_list))
+                    any(db.cc_classes[config.config_restricted_column].value.in_(neg_cc_list))
     else:
         pos_content_cc_filter = true()
         neg_content_cc_filter = false()
@@ -733,8 +749,9 @@ def tags_filters():
 # Creates for all stored languages a translated speaking name in the array for the UI
 def speaking_language(languages=None):
     if not languages:
-        languages = db.session.query(db.Languages).join(db.books_languages_link).join(db.Books).filter(common_filters())\
-        .group_by(text('books_languages_link.lang_code')).all()
+        languages = db.session.query(db.Languages).join(db.books_languages_link).join(db.Books)\
+            .filter(common_filters())\
+            .group_by(text('books_languages_link.lang_code')).all()
     for lang in languages:
         try:
             cur_l = LC.parse(lang.lang_code)
@@ -743,6 +760,7 @@ def speaking_language(languages=None):
             lang.name = _(isoLanguages.get(part3=lang.lang_code).name)
     return languages
 
+
 # checks if domain is in database (including wildcards)
 # example SELECT * FROM @TABLE WHERE  'abcdefg' LIKE Name;
 # from https://code.luasoftware.com/tutorials/flask/execute-raw-sql-in-flask-sqlalchemy/
@@ -787,21 +805,25 @@ def fill_indexpage_with_archived_books(page, database, db_filter, order, allow_s
         randm = false()
     off = int(int(config.config_books_per_page) * (page - 1))
     pagination = Pagination(page, config.config_books_per_page,
-                            len(db.session.query(database).filter(db_filter).filter(common_filters(allow_show_archived)).all()))
-    entries = db.session.query(database).join(*join, isouter=True).filter(db_filter).filter(common_filters(allow_show_archived)).\
-        order_by(*order).offset(off).limit(config.config_books_per_page).all()
+                            len(db.session.query(database).filter(db_filter)
+                                .filter(common_filters(allow_show_archived)).all()))
+    entries = db.session.query(database).join(*join, isouter=True).filter(db_filter)\
+        .filter(common_filters(allow_show_archived))\
+        .order_by(*order).offset(off).limit(config.config_books_per_page).all()
     for book in entries:
         book = order_authors(book)
     return entries, randm, pagination
 
 
-def get_typeahead(database, query, replace=('',''), tag_filter=true()):
+def get_typeahead(database, query, replace=('', ''), tag_filter=true()):
     query = query or ''
     db.session.connection().connection.connection.create_function("lower", 1, lcase)
-    entries = db.session.query(database).filter(tag_filter).filter(func.lower(database.name).ilike("%" + query + "%")).all()
+    entries = db.session.query(database).filter(tag_filter).\
+        filter(func.lower(database.name).ilike("%" + query + "%")).all()
     json_dumps = json.dumps([dict(name=r.name.replace(*replace)) for r in entries])
     return json_dumps
 
+
 # read search results from calibre-database and return it (function is used for feed and simple search
 def get_search_results(term):
     db.session.connection().connection.connection.create_function("lower", 1, lcase)
@@ -820,6 +842,7 @@ def get_search_results(term):
             func.lower(db.Books.title).ilike("%" + term + "%")
             )).all()
 
+
 def get_cc_columns():
     tmpcc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
     if config.config_columns_to_ignore:
@@ -832,6 +855,7 @@ def get_cc_columns():
         cc = tmpcc
     return cc
 
+
 def get_download_link(book_id, book_format):
     book_format = book_format.split(".")[0]
     book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
@@ -856,7 +880,8 @@ def get_download_link(book_id, book_format):
     else:
         abort(404)
 
-def check_exists_book(authr,title):
+
+def check_exists_book(authr, title):
     db.session.connection().connection.connection.create_function("lower", 1, lcase)
     q = list()
     authorterms = re.split(r'\s*&\s*', authr)
@@ -865,11 +890,12 @@ def check_exists_book(authr,title):
 
     return db.session.query(db.Books).filter(
         and_(db.Books.authors.any(and_(*q)),
-            func.lower(db.Books.title).ilike("%" + title + "%")
-            )).first()
+             func.lower(db.Books.title).ilike("%" + title + "%")
+             )).first()
 
 ############### Database Helper functions
 
+
 def lcase(s):
     try:
         return unidecode.unidecode(s.lower())
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 5d05eeee..2c231582 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -80,9 +80,13 @@ def formatdate_filter(val):
         formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S")
         return format_date(formatdate, format='medium', locale=get_locale())
     except AttributeError as e:
-        log.error('Babel error: %s, Current user locale: %s, Current User: %s', e, current_user.locale, current_user.nickname)
+        log.error('Babel error: %s, Current user locale: %s, Current User: %s', e,
+                  current_user.locale,
+                  current_user.nickname
+                  )
         return formatdate
 
+
 @jinjia.app_template_filter('formatdateinput')
 def format_date_input(val):
     conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val)
diff --git a/cps/kobo.py b/cps/kobo.py
index ee0aa810..48cb4492 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -385,7 +385,7 @@ def get_metadata(book):
             name = get_series(book)
         metadata["Series"] = {
             "Name": get_series(book),
-            "Number": book.series_index,
+            "Number": book.series_index,        # ToDo Check int() ?
             "NumberFloat": float(book.series_index),
             # Get a deterministic id based on the series name.
             "Id": uuid.uuid3(uuid.NAMESPACE_DNS, name),
@@ -407,8 +407,10 @@ def HandleTagCreate():
         log.debug("Received malformed v1/library/tags request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Name' or 'Items' field")
 
+    # ToDO: Names are not unique ! -> filter only private shelfs
     shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.name) == name, ub.Shelf.user_id ==
-                                              current_user.id).one_or_none()
+                                              current_user.id).one_or_none() # ToDO: shouldn't it ) at the end
+
     if shelf and not shelf_lib.check_shelf_edit_permissions(shelf):
         abort(401, description="User is unauthaurized to edit shelf.")
 
@@ -517,6 +519,7 @@ def HandleTagRemoveItem(tag_id):
         log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
 
+    # insconsitent to above requests
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.uuid == tag_id,
                                               ub.Shelf.user_id == current_user.id).one_or_none()
     if not shelf:
@@ -552,7 +555,8 @@ def HandleTagRemoveItem(tag_id):
 def sync_shelves(sync_token, sync_results):
     new_tags_last_modified = sync_token.tags_last_modified
 
-    for shelf in ub.session.query(ub.ShelfArchive).filter(func.datetime(ub.ShelfArchive.last_modified) > sync_token.tags_last_modified, ub.ShelfArchive.user_id == current_user.id):
+    for shelf in ub.session.query(ub.ShelfArchive).filter(func.datetime(ub.ShelfArchive.last_modified) > sync_token.tags_last_modified,
+                                                          ub.ShelfArchive.user_id == current_user.id):
         new_tags_last_modified = max(shelf.last_modified, new_tags_last_modified)
 
         sync_results.append({
@@ -564,7 +568,8 @@ def sync_shelves(sync_token, sync_results):
             }
         })
 
-    for shelf in ub.session.query(ub.Shelf).filter(func.datetime(ub.Shelf.last_modified) > sync_token.tags_last_modified, ub.Shelf.user_id == current_user.id):
+    for shelf in ub.session.query(ub.Shelf).filter(func.datetime(ub.Shelf.last_modified) > sync_token.tags_last_modified,
+                                                   ub.Shelf.user_id == current_user.id):
         if not shelf_lib.check_shelf_view_permissions(shelf):
             continue
 
@@ -600,6 +605,7 @@ def create_kobo_tag(shelf):
         book = db.session.query(db.Books).filter(db.Books.id == book_shelf.book_id).one_or_none()
         if not book:
             log.info(u"Book (id: %s) in BookShelf (id: %s) not found in book database",  book_shelf.book_id, shelf.id)
+            # ToDo shouldn't it continue?
             return None
         tag["Items"].append(
             {
@@ -769,7 +775,8 @@ def HandleCoverImageRequest(book_uuid, width, height,Quality, isGreyscale):
                                                                                    height=height), 307)
         else:
             log.debug("Cover for unknown book: %s requested" % book_uuid)
-            return redirect_or_proxy_request()
+            # additional proxy request make no sense, -> direct return
+            return make_response(jsonify({}))
     log.debug("Cover request received for book %s" % book_uuid)
     return book_cover
 
diff --git a/cps/logger.py b/cps/logger.py
index c5b686f2..3f850442 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -108,7 +108,7 @@ def setup(log_file, log_level=None):
         r.setLevel(log_level)
 
     # Otherwise name get's destroyed on windows
-    if log_file != LOG_TO_STDERR and log_file !=  LOG_TO_STDOUT:
+    if log_file != LOG_TO_STDERR and log_file != LOG_TO_STDOUT:
         log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE)
 
     previous_handler = r.handlers[0] if r.handlers else None
diff --git a/cps/oauth.py b/cps/oauth.py
index e5c5fb5f..d754dad7 100644
--- a/cps/oauth.py
+++ b/cps/oauth.py
@@ -30,7 +30,7 @@ except ImportError:
         from flask_dance.consumer.storage.sqla import SQLAlchemyStorage as SQLAlchemyBackend
         from flask_dance.consumer.storage.sqla import first, _get_real_user
         from sqlalchemy.orm.exc import NoResultFound
-        backend_resultcode = True # prevent storing values with this resultcode
+        backend_resultcode = True  # prevent storing values with this resultcode
     except ImportError:
         pass
 
@@ -97,7 +97,7 @@ try:
         def set(self, blueprint, token, user=None, user_id=None):
             uid = first([user_id, self.user_id, blueprint.config.get("user_id")])
             u = first(_get_real_user(ref, self.anon_user)
-                        for ref in (user, self.user, blueprint.config.get("user")))
+                      for ref in (user, self.user, blueprint.config.get("user")))
 
             if self.user_required and not u and not uid:
                 raise ValueError("Cannot set OAuth token without an associated user")
diff --git a/cps/opds.py b/cps/opds.py
index 8877cfb2..3085b7de 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -56,8 +56,8 @@ def requires_basic_auth_if_no_ano(f):
     return decorated
 
 
-class FeedObject():
-    def __init__(self,rating_id , rating_name):
+class FeedObject:
+    def __init__(self, rating_id, rating_name):
         self.rating_id = rating_id
         self.rating_name = rating_name
 
@@ -101,7 +101,7 @@ def feed_normal_search():
 def feed_new():
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                                                 db.Books, True, [db.Books.timestamp.desc()])
+                                             db.Books, True, [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -119,7 +119,8 @@ def feed_discover():
 def feed_best_rated():
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.ratings.any(db.Ratings.rating > 9), [db.Books.timestamp.desc()])
+                                             db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -153,7 +154,8 @@ def feed_hot():
 def feed_authorindex():
     off = request.args.get("offset") or 0
     entries = db.session.query(db.Authors).join(db.books_authors_link).join(db.Books).filter(common_filters())\
-        .group_by(text('books_authors_link.author')).order_by(db.Authors.sort).limit(config.config_books_per_page).offset(off)
+        .group_by(text('books_authors_link.author')).order_by(db.Authors.sort).limit(config.config_books_per_page)\
+        .offset(off)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             len(db.session.query(db.Authors).all()))
     return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_author', pagination=pagination)
@@ -164,7 +166,9 @@ def feed_authorindex():
 def feed_author(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.authors.any(db.Authors.id == book_id), [db.Books.timestamp.desc()])
+                                             db.Books,
+                                             db.Books.authors.any(db.Authors.id == book_id),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -173,7 +177,8 @@ def feed_author(book_id):
 def feed_publisherindex():
     off = request.args.get("offset") or 0
     entries = db.session.query(db.Publishers).join(db.books_publishers_link).join(db.Books).filter(common_filters())\
-        .group_by(text('books_publishers_link.publisher')).order_by(db.Publishers.sort).limit(config.config_books_per_page).offset(off)
+        .group_by(text('books_publishers_link.publisher')).order_by(db.Publishers.sort)\
+        .limit(config.config_books_per_page).offset(off)
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
                             len(db.session.query(db.Publishers).all()))
     return render_xml_template('feed.xml', listelements=entries, folder='opds.feed_publisher', pagination=pagination)
@@ -184,7 +189,8 @@ def feed_publisherindex():
 def feed_publisher(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                                             db.Books, db.Books.publishers.any(db.Publishers.id == book_id),
+                                             db.Books,
+                                             db.Books.publishers.any(db.Publishers.id == book_id),
                                              [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -205,7 +211,9 @@ def feed_categoryindex():
 def feed_category(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.tags.any(db.Tags.id == book_id), [db.Books.timestamp.desc()])
+                                             db.Books,
+                                             db.Books.tags.any(db.Tags.id == book_id),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -225,9 +233,12 @@ def feed_seriesindex():
 def feed_series(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.series.any(db.Series.id == book_id), [db.Books.series_index])
+                                             db.Books,
+                                             db.Books.series.any(db.Series.id == book_id),
+                                             [db.Books.series_index])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
+
 @opds.route("/opds/ratings")
 @requires_basic_auth_if_no_ano
 def feed_ratingindex():
@@ -244,16 +255,18 @@ def feed_ratingindex():
         element.append(FeedObject(entry[0].id, "{} Stars".format(entry.name)))
     return render_xml_template('feed.xml', listelements=element, folder='opds.feed_ratings', pagination=pagination)
 
+
 @opds.route("/opds/ratings/<book_id>")
 @requires_basic_auth_if_no_ano
 def feed_ratings(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.ratings.any(db.Ratings.id == book_id),[db.Books.timestamp.desc()])
+                                             db.Books,
+                                             db.Books.ratings.any(db.Ratings.id == book_id),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
-
 @opds.route("/opds/formats")
 @requires_basic_auth_if_no_ano
 def feed_formatindex():
@@ -274,7 +287,9 @@ def feed_formatindex():
 def feed_format(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.data.any(db.Data.format == book_id.upper()), [db.Books.timestamp.desc()])
+                                             db.Books,
+                                             db.Books.data.any(db.Data.format == book_id.upper()),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -306,7 +321,9 @@ def feed_languagesindex():
 def feed_languages(book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
-                    db.Books, db.Books.languages.any(db.Languages.id == book_id), [db.Books.timestamp.desc()])
+                                             db.Books,
+                                             db.Books.languages.any(db.Languages.id == book_id),
+                                             [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -326,7 +343,8 @@ def feed_shelfindex():
 def feed_shelf(book_id):
     off = request.args.get("offset") or 0
     if current_user.is_anonymous:
-        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == book_id, not ub.Shelf.deleted).first()
+        shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1,
+                                                  ub.Shelf.id == book_id, not ub.Shelf.deleted).first()
     else:
         shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
                                                            ub.Shelf.id == book_id),
@@ -349,11 +367,11 @@ def feed_shelf(book_id):
 @requires_basic_auth_if_no_ano
 @download_required
 def opds_download_link(book_id, book_format):
-    return get_download_link(book_id,book_format.lower())
+    return get_download_link(book_id, book_format.lower())
 
 
 @opds.route("/ajax/book/<string:uuid>/<library>")
-@opds.route("/ajax/book/<string:uuid>",defaults={'library': ""})
+@opds.route("/ajax/book/<string:uuid>", defaults={'library': ""})
 @requires_basic_auth_if_no_ano
 def get_metadata_calibre_companion(uuid, library):
     entry = db.session.query(db.Books).filter(db.Books.uuid.like("%" + uuid + "%")).first()
@@ -369,16 +387,17 @@ def get_metadata_calibre_companion(uuid, library):
 def feed_search(term):
     if term:
         term = term.strip().lower()
-        entries = get_search_results( term)
+        entries = get_search_results(term)
         entriescount = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entriescount, entriescount)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
     else:
         return render_xml_template('feed.xml', searchterm="")
 
+
 def check_auth(username, password):
     if sys.version_info.major == 3:
-        username=username.encode('windows-1252')
+        username = username.encode('windows-1252')
     user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) ==
                                             username.decode('utf-8').lower()).first()
     return bool(user and check_password_hash(str(user.password), password))
@@ -392,13 +411,14 @@ def authenticate():
 
 
 def render_xml_template(*args, **kwargs):
-    #ToDo: return time in current timezone similar to %z
+    # ToDo: return time in current timezone similar to %z
     currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00")
     xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs)
     response = make_response(xml)
     response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
     return response
 
+
 @opds.route("/opds/thumb_240_240/<book_id>")
 @opds.route("/opds/cover_240_240/<book_id>")
 @opds.route("/opds/cover_90_90/<book_id>")
@@ -407,13 +427,15 @@ def render_xml_template(*args, **kwargs):
 def feed_get_cover(book_id):
     return get_book_cover(book_id)
 
+
 @opds.route("/opds/readbooks")
 @requires_basic_auth_if_no_ano
 def feed_read_books():
     off = request.args.get("offset") or 0
-    result, pagination =  render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True)
+    result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, True, True)
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
+
 @opds.route("/opds/unreadbooks")
 @requires_basic_auth_if_no_ano
 def feed_unread_books():
diff --git a/cps/server.py b/cps/server.py
index a108181b..d2253ab2 100755
--- a/cps/server.py
+++ b/cps/server.py
@@ -43,7 +43,6 @@ from . import logger
 log = logger.create()
 
 
-
 def _readable_listen_address(address, port):
     if ':' in address:
         address = "[" + address + "]"
@@ -84,7 +83,8 @@ class WebServer(object):
             if os.path.isfile(certfile_path) and os.path.isfile(keyfile_path):
                 self.ssl_args = dict(certfile=certfile_path, keyfile=keyfile_path)
             else:
-                log.warning('The specified paths for the ssl certificate file and/or key file seem to be broken. Ignoring ssl.')
+                log.warning('The specified paths for the ssl certificate file and/or key file seem to be broken. '
+                            'Ignoring ssl.')
                 log.warning('Cert path: %s', certfile_path)
                 log.warning('Key path:  %s', keyfile_path)
 
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index abc639f1..1dd4f084 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -49,10 +49,11 @@ def get_datetime_from_json(json_object, field_name):
         return datetime.min
 
 
-class SyncToken():
+class SyncToken:
     """ The SyncToken is used to persist state accross requests.
-    When serialized over the response headers, the Kobo device will propagate the token onto following requests to the service.
-    As an example use-case, the SyncToken is used to detect books that have been added to the library since the last time the device synced to the server.
+    When serialized over the response headers, the Kobo device will propagate the token onto following
+    requests to the service. As an example use-case, the SyncToken is used to detect books that have been added
+    to the library since the last time the device synced to the server.
 
     Attributes:
         books_last_created: Datetime representing the newest book that the device knows about.
@@ -66,10 +67,11 @@ class SyncToken():
 
     token_schema = {
         "type": "object",
-        "properties": {"version": {"type": "string"}, "data": {"type": "object"},},
+        "properties": {"version": {"type": "string"}, "data": {"type": "object"}, },
     }
     # This Schema doesn't contain enough information to detect and propagate book deletions from Calibre to the device.
-    # A potential solution might be to keep a list of all known book uuids in the token, and look for any missing from the db.
+    # A potential solution might be to keep a list of all known book uuids in the token, and look for any missing
+    # from the db.
     data_schema_v1 = {
         "type": "object",
         "properties": {
diff --git a/cps/shelf.py b/cps/shelf.py
index 4924a186..8b9dd999 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -25,7 +25,7 @@ from __future__ import division, print_function, unicode_literals
 from flask import Blueprint, request, flash, redirect, url_for
 from flask_babel import gettext as _
 from flask_login import login_required, current_user
-from sqlalchemy.sql.expression import func, or_, and_
+from sqlalchemy.sql.expression import func
 
 from . import logger, ub, searched_ids, db
 from .web import render_title_template
@@ -35,6 +35,7 @@ from .helper import common_filters
 shelf = Blueprint('shelf', __name__)
 log = logger.create()
 
+
 def check_shelf_edit_permissions(cur_shelf):
     if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
         log.error("User %s not allowed to edit shelf %s", current_user, cur_shelf)
@@ -74,7 +75,7 @@ def add_to_shelf(shelf_id, book_id):
         return "Sorry you are not allowed to add a book to the the shelf: %s" % shelf.name, 403
 
     book_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
-                                          ub.BookShelf.book_id == book_id).first()
+                                                          ub.BookShelf.book_id == book_id).first()
     if book_in_shelf:
         log.error("Book %s is already part of %s", book_id, shelf)
         if not xhr:
@@ -195,7 +196,6 @@ def remove_from_shelf(shelf_id, book_id):
         return "Sorry you are not allowed to remove a book from this shelf: %s" % shelf.name, 403
 
 
-
 @shelf.route("/shelf/create", methods=["GET", "POST"])
 @login_required
 def create_shelf():
@@ -214,21 +214,24 @@ def create_shelf():
                 .first() is None
 
             if not is_shelf_name_unique:
-                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
+                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                      category="error")
         else:
             is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \
-                .first() is None
+                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) &
+                        (ub.Shelf.user_id == int(current_user.id)))\
+                                       .first() is None
 
             if not is_shelf_name_unique:
-                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
+                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                      category="error")
 
         if is_shelf_name_unique:
             try:
                 ub.session.add(shelf)
                 ub.session.commit()
                 flash(_(u"Shelf %(title)s created", title=to_save["title"]), category="success")
-                return redirect(url_for('shelf.show_shelf', shelf_id = shelf.id ))
+                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
             except Exception:
                 flash(_(u"There was an error"), category="error")
         return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
@@ -240,7 +243,7 @@ def create_shelf():
 @login_required
 def edit_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    if request.method == "POST":            
+    if request.method == "POST":
         to_save = request.form.to_dict()
 
         is_shelf_name_unique = False
@@ -251,15 +254,18 @@ def edit_shelf(shelf_id):
                 .first() is None
 
             if not is_shelf_name_unique:
-                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
+                flash(_(u"A public shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                      category="error")
         else:
             is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) & (ub.Shelf.user_id == int(current_user.id))) \
-                .filter(ub.Shelf.id != shelf_id) \
-                .first() is None
+                .filter((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 0) &
+                        (ub.Shelf.user_id == int(current_user.id)))\
+                                       .filter(ub.Shelf.id != shelf_id)\
+                                       .first() is None
 
             if not is_shelf_name_unique:
-                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
+                flash(_(u"A private shelf with the name '%(title)s' already exists.", title=to_save["title"]),
+                      category="error")
 
         if is_shelf_name_unique:
             shelf.name = to_save["title"]
@@ -283,7 +289,7 @@ def delete_shelf_helper(cur_shelf):
     shelf_id = cur_shelf.id
     ub.session.delete(cur_shelf)
     ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
-    ub.session.add(ub.ShelfArchive(uuid = cur_shelf.uuid, user_id = cur_shelf.uuid))
+    ub.session.add(ub.ShelfArchive(uuid=cur_shelf.uuid, user_id=cur_shelf.uuid))
     ub.session.commit()
     log.info("successfully deleted %s", cur_shelf)
 
@@ -295,7 +301,7 @@ def delete_shelf(shelf_id):
     delete_shelf_helper(cur_shelf)
     return redirect(url_for('web.index'))
 
-# @shelf.route("/shelfdown/<int:shelf_id>")
+
 @shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1})
 @shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>")
 def show_shelf(shelf_type, shelf_id):
@@ -319,13 +325,12 @@ def show_shelf(shelf_type, shelf_id):
                     ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book.book_id).delete()
                     ub.session.commit()
         return render_title_template(page, entries=result, title=_(u"Shelf: '%(name)s'", name=shelf.name),
-                                 shelf=shelf, page="shelf")
+                                     shelf=shelf, page="shelf")
     else:
         flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
         return redirect(url_for("web.index"))
 
 
-
 @shelf.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def order_shelf(shelf_id):
@@ -347,17 +352,17 @@ def order_shelf(shelf_id):
         for book in books_in_shelf2:
             cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).filter(common_filters()).first()
             if cur_book:
-                result.append({'title':cur_book.title,
-                               'id':cur_book.id,
-                               'author':cur_book.authors,
-                               'series':cur_book.series,
-                               'series_index':cur_book.series_index})
+                result.append({'title': cur_book.title,
+                               'id': cur_book.id,
+                               'author': cur_book.authors,
+                               'series': cur_book.series,
+                               'series_index': cur_book.series_index})
             else:
                 cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
-                result.append({'title':_('Hidden Book'),
-                               'id':cur_book.id,
-                               'author':[],
-                               'series':[]})
+                result.append({'title': _('Hidden Book'),
+                               'id': cur_book.id,
+                               'author': [],
+                               'series': []})
     return render_title_template('shelf_order.html', entries=result,
                                  title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
                                  shelf=shelf, page="shelforder")
diff --git a/cps/subproc_wrapper.py b/cps/subproc_wrapper.py
index 4242a83e..0ad1c1d2 100644
--- a/cps/subproc_wrapper.py
+++ b/cps/subproc_wrapper.py
@@ -45,10 +45,10 @@ def process_open(command, quotes=(), env=None, sout=subprocess.PIPE, serr=subpro
 
 
 def process_wait(command, serr=subprocess.PIPE):
-    '''Run command, wait for process to terminate, and return an iterator over lines of its output.'''
+    # Run command, wait for process to terminate, and return an iterator over lines of its output.
     p = process_open(command, serr=serr)
     p.wait()
-    for l in p.stdout.readlines():
-        if isinstance(l, bytes):
-            l = l.decode('utf-8')
-        yield l
+    for line in p.stdout.readlines():
+        if isinstance(line, bytes):
+            line = line.decode('utf-8')
+        yield line
diff --git a/cps/templates/list.html b/cps/templates/list.html
index de7989c4..bedfa7a0 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -4,18 +4,18 @@
 
     <div class="filterheader hidden-xs hidden-sm">
       {% if entries.__len__() %}
-       {% if entries[0][0].sort %}
-        <button id="sort_name" class="btn btn-success"><b>B,A <-> A B</b></button>
+       {% if data == 'author' %}
+        <button id="sort_name" class="btn btn-primary"><b>B,A <-> A B</b></button>
        {% endif %}
       {% endif %}
-      <button id="desc" class="btn btn-success"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
-      <button id="asc" class="btn btn-success"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
+      <button id="desc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
+      <button id="asc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
       {% if charlist|length %}
-      <button id="all" class="btn btn-success">{{_('All')}}</button>
+      <button id="all" class="btn btn-primary">{{_('All')}}</button>
       {% endif %}
       <div class="btn-group character" role="group">
         {% for char in charlist%}
-        <button class="btn btn-success char">{{char.char}}</button>
+        <button class="btn btn-primary char">{{char.char}}</button>
         {% endfor %}
       </div>
     </div>
diff --git a/cps/ub.py b/cps/ub.py
index d53349cf..a8f8cfa8 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -42,11 +42,10 @@ from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import backref, foreign, relationship, remote, sessionmaker, Session
-from sqlalchemy.sql.expression import and_
+from sqlalchemy.orm import backref, relationship, sessionmaker, Session
 from werkzeug.security import generate_password_hash
 
-from . import constants # , config
+from . import constants
 
 
 session = None
@@ -57,39 +56,39 @@ def get_sidebar_config(kwargs=None):
     kwargs = kwargs or []
     if 'content' in kwargs:
         content = kwargs['content']
-        content = isinstance(content, (User,LocalProxy)) and not content.role_anonymous()
+        content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
     else:
         content = 'conf' in kwargs
     sidebar = list()
     sidebar.append({"glyph": "glyphicon-book", "text": _('Recently Added'), "link": 'web.index', "id": "new",
                     "visibility": constants.SIDEBAR_RECENT, 'public': True, "page": "root",
-                    "show_text": _('Show recent books'), "config_show":True})
+                    "show_text": _('Show recent books'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-fire", "text": _('Hot Books'), "link": 'web.books_list', "id": "hot",
-                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot", "show_text": _('Show Hot Books'),
-                    "config_show":True})
+                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot",
+                    "show_text": _('Show Hot Books'), "config_show": True})
     sidebar.append(
         {"glyph": "glyphicon-star", "text": _('Top Rated Books'), "link": 'web.books_list', "id": "rated",
          "visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
-         "show_text": _('Show Top Rated Books'), "config_show":True})
+         "show_text": _('Show Top Rated Books'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
                     "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "read",
                     "show_text": _('Show read and unread'), "config_show": content})
     sidebar.append(
         {"glyph": "glyphicon-eye-close", "text": _('Unread Books'), "link": 'web.books_list', "id": "unread",
          "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "unread",
-         "show_text": _('Show unread'), "config_show":False})
+         "show_text": _('Show unread'), "config_show": False})
     sidebar.append({"glyph": "glyphicon-random", "text": _('Discover'), "link": 'web.books_list', "id": "rand",
                     "visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
-                    "show_text": _('Show random books'), "config_show":True})
+                    "show_text": _('Show random books'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
                     "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category",
-                    "show_text": _('Show category selection'), "config_show":True})
+                    "show_text": _('Show category selection'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",
                     "visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series",
-                    "show_text": _('Show series selection'), "config_show":True})
+                    "show_text": _('Show series selection'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-user", "text": _('Authors'), "link": 'web.author_list', "id": "author",
                     "visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author",
-                    "show_text": _('Show author selection'), "config_show":True})
+                    "show_text": _('Show author selection'), "config_show": True})
     sidebar.append(
         {"glyph": "glyphicon-text-size", "text": _('Publishers'), "link": 'web.publisher_list', "id": "publisher",
          "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
@@ -97,13 +96,13 @@ def get_sidebar_config(kwargs=None):
     sidebar.append({"glyph": "glyphicon-flag", "text": _('Languages'), "link": 'web.language_overview', "id": "lang",
                     "visibility": constants.SIDEBAR_LANGUAGE, 'public': (g.user.filter_language() == 'all'),
                     "page": "language",
-                    "show_text": _('Show language selection'), "config_show":True})
+                    "show_text": _('Show language selection'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
                     "visibility": constants.SIDEBAR_RATING, 'public': True,
-                    "page": "rating", "show_text": _('Show ratings selection'), "config_show":True})
+                    "page": "rating", "show_text": _('Show ratings selection'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
                     "visibility": constants.SIDEBAR_FORMAT, 'public': True,
-                    "page": "format", "show_text": _('Show file formats selection'), "config_show":True})
+                    "page": "format", "show_text": _('Show file formats selection'), "config_show": True})
     sidebar.append(
         {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
          "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
@@ -236,7 +235,8 @@ class Anonymous(AnonymousUserMixin, UserBase):
         self.loadSettings()
 
     def loadSettings(self):
-        data = session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first()  # type: User
+        data = session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS)\
+            .first()  # type: User
         self.nickname = data.nickname
         self.role = data.role
         self.id=data.id
@@ -259,7 +259,7 @@ class Anonymous(AnonymousUserMixin, UserBase):
 
     @property
     def is_anonymous(self):
-        return True # self.anon_browse
+        return True
 
     @property
     def is_authenticated(self):
@@ -271,7 +271,7 @@ class Shelf(Base):
     __tablename__ = 'shelf'
 
     id = Column(Integer, primary_key=True)
-    uuid = Column(String, default=lambda : str(uuid.uuid4()))
+    uuid = Column(String, default=lambda: str(uuid.uuid4()))
     name = Column(String)
     is_public = Column(Integer, default=0)
     user_id = Column(Integer, ForeignKey('user.id'))
@@ -318,8 +318,12 @@ class ReadBook(Base):
     book_id = Column(Integer, unique=False)
     user_id = Column(Integer, ForeignKey('user.id'), unique=False)
     read_status = Column(Integer, unique=False, default=STATUS_UNREAD, nullable=False)
-    kobo_reading_state = relationship("KoboReadingState", uselist=False, primaryjoin="and_(ReadBook.user_id == foreign(KoboReadingState.user_id), "
-                                "ReadBook.book_id == foreign(KoboReadingState.book_id))", cascade="all", backref=backref("book_read_link", uselist=False))
+    kobo_reading_state = relationship("KoboReadingState", uselist=False,
+                                      primaryjoin="and_(ReadBook.user_id == foreign(KoboReadingState.user_id), "
+                                                  "ReadBook.book_id == foreign(KoboReadingState.book_id))",
+                                      cascade="all",
+                                      backref=backref("book_read_link",
+                                                      uselist=False))
     last_modified = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow)
     last_time_started_reading = Column(DateTime, nullable=True)
     times_started_reading = Column(Integer, default=0, nullable=False)
@@ -334,6 +338,7 @@ class Bookmark(Base):
     format = Column(String(collation='NOCASE'))
     bookmark_key = Column(String)
 
+
 # Baseclass representing books that are archived on the user's Kobo device.
 class ArchivedBook(Base):
     __tablename__ = 'archived_book'
@@ -421,7 +426,6 @@ class Registration(Base):
         return u"<Registration('{0}')>".format(self.domain)
 
 
-
 class RemoteAuthToken(Base):
     __tablename__ = 'remote_auth_token'
 
@@ -486,7 +490,7 @@ def migrate_Database(session):
         conn.execute("UPDATE book_read_link SET 'read_status' = 1 WHERE is_read")
         conn.execute("ALTER TABLE book_read_link ADD column 'last_modified' DATETIME")
         conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
-        conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")    
+        conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
         session.commit()
     try:
         session.query(exists().where(Shelf.uuid)).scalar()
@@ -531,19 +535,13 @@ def migrate_Database(session):
     except exc.OperationalError:
         conn = engine.connect()
         conn.execute("UPDATE user SET 'sidebar_view' = (random_books* :side_random + language_books * :side_lang "
-            "+ series_books * :side_series + category_books * :side_category + hot_books * "
-            ":side_hot + :side_autor + :detail_random)"
-            ,{'side_random': constants.SIDEBAR_RANDOM, 'side_lang': constants.SIDEBAR_LANGUAGE,
-              'side_series': constants.SIDEBAR_SERIES,
-            'side_category': constants.SIDEBAR_CATEGORY, 'side_hot': constants.SIDEBAR_HOT,
-              'side_autor': constants.SIDEBAR_AUTHOR,
-            'detail_random': constants.DETAIL_RANDOM})
+                     "+ series_books * :side_series + category_books * :side_category + hot_books * "
+                     ":side_hot + :side_autor + :detail_random)",
+                     {'side_random': constants.SIDEBAR_RANDOM, 'side_lang': constants.SIDEBAR_LANGUAGE,
+                      'side_series': constants.SIDEBAR_SERIES, 'side_category': constants.SIDEBAR_CATEGORY,
+                      'side_hot': constants.SIDEBAR_HOT, 'side_autor': constants.SIDEBAR_AUTHOR,
+                      'detail_random': constants.DETAIL_RANDOM})
         session.commit()
-    '''try:
-        session.query(exists().where(User.mature_content)).scalar()
-    except exc.OperationalError:
-        conn = engine.connect()
-        conn.execute("ALTER TABLE user ADD column `mature_content` INTEGER DEFAULT 1")'''
     try:
         session.query(exists().where(User.denied_tags)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
@@ -552,7 +550,8 @@ def migrate_Database(session):
         conn.execute("ALTER TABLE user ADD column `allowed_tags` String DEFAULT ''")
         conn.execute("ALTER TABLE user ADD column `denied_column_value` DEFAULT ''")
         conn.execute("ALTER TABLE user ADD column `allowed_column_value` DEFAULT ''")
-    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() is None:
+    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
+        is None:
         create_anonymous_user(session)
     try:
         # check if one table with autoincrement is existing (should be user table)
@@ -562,20 +561,20 @@ def migrate_Database(session):
         # Create new table user_id and copy contents of table user into it
         conn = engine.connect()
         conn.execute("CREATE TABLE user_id (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
-                            "nickname VARCHAR(64),"
-                            "email VARCHAR(120),"
-                            "role SMALLINT,"
-                            "password VARCHAR,"
-                            "kindle_mail VARCHAR(120),"
-                            "locale VARCHAR(2),"
-                            "sidebar_view INTEGER,"
-                            "default_language VARCHAR(3),"
-                            "UNIQUE (nickname),"
-                            "UNIQUE (email))")
+                     " nickname VARCHAR(64),"
+                     "email VARCHAR(120),"
+                     "role SMALLINT,"
+                     "password VARCHAR,"
+                     "kindle_mail VARCHAR(120),"
+                     "locale VARCHAR(2),"
+                     "sidebar_view INTEGER,"
+                     "default_language VARCHAR(3),"
+                     "UNIQUE (nickname),"
+                     "UNIQUE (email))")
         conn.execute("INSERT INTO user_id(id, nickname, email, role, password, kindle_mail,locale,"
-                        "sidebar_view, default_language) "
+                     "sidebar_view, default_language) "
                      "SELECT id, nickname, email, role, password, kindle_mail, locale,"
-                        "sidebar_view, default_language FROM user")
+                     "sidebar_view, default_language FROM user")
         # delete old user table and rename new user_id table to user:
         conn.execute("DROP TABLE user")
         conn.execute("ALTER TABLE user_id RENAME TO user")
@@ -591,25 +590,26 @@ def clean_database(session):
     # Remove expired remote login tokens
     now = datetime.datetime.now()
     session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
-        filter(RemoteAuthToken.token_type !=1 ).delete()
+        filter(RemoteAuthToken.token_type != 1).delete()
     session.commit()
 
 
 # Save downloaded books per user in calibre-web's own database
 def update_download(book_id, user_id):
-    check = session.query(Downloads).filter(Downloads.user_id == user_id).filter(Downloads.book_id ==
-                                                                                          book_id).first()
+    check = session.query(Downloads).filter(Downloads.user_id == user_id).filter(Downloads.book_id == book_id).first()
 
     if not check:
         new_download = Downloads(user_id=user_id, book_id=book_id)
         session.add(new_download)
         session.commit()
 
+
 # Delete non exisiting downloaded books in calibre-web's own database
 def delete_download(book_id):
     session.query(Downloads).filter(book_id == Downloads.book_id).delete()
     session.commit()
 
+
 # Generate user Guest (translated text), as anoymous user, no rights
 def create_anonymous_user(session):
     user = User()
@@ -667,8 +667,12 @@ def dispose():
     old_session = session
     session = None
     if old_session:
-        try: old_session.close()
-        except: pass
+        try:
+            old_session.close()
+        except Exception:
+            pass
         if old_session.bind:
-            try: old_session.bind.dispose()
-            except: pass
+            try:
+                old_session.bind.dispose()
+            except Exception:
+                pass
diff --git a/cps/updater.py b/cps/updater.py
index 0cc0c4f5..e4883370 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -69,7 +69,7 @@ class Updater(threading.Thread):
     def get_available_updates(self, request_method, locale):
         if config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_available_updates(request_method)
-        return self._nightly_available_updates(request_method,locale)
+        return self._nightly_available_updates(request_method, locale)
 
     def do_work(self):
         try:
@@ -132,7 +132,7 @@ class Updater(threading.Thread):
     def pause(self):
         self.can_run.clear()
 
-    #should just resume the thread
+    # should just resume the thread
     def resume(self):
         self.can_run.set()
 
@@ -268,7 +268,7 @@ class Updater(threading.Thread):
 
     def is_venv(self):
         if (hasattr(sys, 'real_prefix')) or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
-            return os.sep + os.path.relpath(sys.prefix,constants.BASE_DIR)
+            return os.sep + os.path.relpath(sys.prefix, constants.BASE_DIR)
         else:
             return False
 
@@ -280,7 +280,7 @@ class Updater(threading.Thread):
 
     @classmethod
     def _stable_version_info(cls):
-        return constants.STABLE_VERSION # Current version
+        return constants.STABLE_VERSION  # Current version
 
     def _nightly_available_updates(self, request_method, locale):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
@@ -436,7 +436,7 @@ class Updater(threading.Thread):
                             patch_version_update > current_version[2]) or \
                             minor_version_update > current_version[1]:
                         parents.append([commit[i]['tag_name'], commit[i]['body'].replace('\r\n', '<p>')])
-                        newer=True
+                        newer = True
                     i -= 1
                     continue
                 if major_version_update < current_version[0]:

From 95ca1e6a9dab8dbff31fef6635648e391a006cdd Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 20 Apr 2020 18:56:39 +0200
Subject: [PATCH 21/38] Fix for #1319

---
 cps/editbooks.py | 147 ++++++++++++++++++++++++++++++-----------------
 cps/web.py       |  10 ++--
 2 files changed, 98 insertions(+), 59 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 28a8d2a6..5bf36139 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -22,7 +22,7 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import datetime
+from datetime import datetime
 import json
 from shutil import move, copyfile
 from uuid import uuid4
@@ -47,7 +47,7 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
     # passing input_elements not as a list may lead to undesired results
     if not isinstance(input_elements, list):
         raise TypeError(str(input_elements) + " should be passed as a list")
-
+    changed = False
     input_elements = [x for x in input_elements if x != '']
     # we have all input element (authors, series, tags) names now
     # 1. search for elements to remove
@@ -88,6 +88,7 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
     if len(del_elements) > 0:
         for del_element in del_elements:
             db_book_object.remove(del_element)
+            changed = True
             if len(del_element.books) == 0:
                 db_session.delete(del_element)
     # if there are elements to add, we add them now!
@@ -114,49 +115,48 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
             else:  # db_type should be tag or language
                 new_element = db_object(add_element)
             if db_element is None:
+                changed = True
                 db_session.add(new_element)
                 db_book_object.append(new_element)
             else:
                 if db_type == 'custom':
                     if db_element.value != add_element:
                         new_element.value = add_element
-                        # new_element = db_element
                 elif db_type == 'languages':
                     if db_element.lang_code != add_element:
                         db_element.lang_code = add_element
-                        # new_element = db_element
                 elif db_type == 'series':
                     if db_element.name != add_element:
-                        db_element.name = add_element # = add_element # new_element = db_object(add_element, add_element)
+                        db_element.name = add_element
                         db_element.sort = add_element
-                        # new_element = db_element
                 elif db_type == 'author':
                     if db_element.name != add_element:
                         db_element.name = add_element
                         db_element.sort = add_element.replace('|', ',')
-                        # new_element = db_element
                 elif db_type == 'publisher':
                     if db_element.name != add_element:
                         db_element.name = add_element
                         db_element.sort = None
-                        # new_element = db_element
                 elif db_element.name != add_element:
                     db_element.name = add_element
-                    # new_element = db_element
                 # add element to book
+                changed = True
                 db_book_object.append(db_element)
+    return changed
 
 
 def modify_identifiers(input_identifiers, db_identifiers, db_session):
     """Modify Identifiers to match input information.
        input_identifiers is a list of read-to-persist Identifiers objects.
        db_identifiers is a list of already persisted list of Identifiers objects."""
+    changed = False
     input_dict = dict([ (identifier.type.lower(), identifier) for identifier in input_identifiers ])
     db_dict = dict([ (identifier.type.lower(), identifier) for identifier in db_identifiers ])
     # delete db identifiers not present in input or modify them with input val
     for identifier_type, identifier in db_dict.items():
         if identifier_type not in input_dict.keys():
             db_session.delete(identifier)
+            changed = True
         else:
             input_identifier = input_dict[identifier_type]
             identifier.type = input_identifier.type
@@ -165,6 +165,8 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
     for identifier_type, identifier in input_dict.items():
         if identifier_type not in db_dict.keys():
             db_session.add(identifier)
+            changed = True
+    return changed
 
 
 @editbook.route("/delete/<int:book_id>/", defaults={'book_format': ""})
@@ -266,7 +268,53 @@ def render_edit_book(book_id):
                                  source_formats=valid_source_formats)
 
 
+def edit_book_ratings(to_save, book):
+    changed = False
+    if to_save["rating"].strip():
+        old_rating = False
+        if len(book.ratings) > 0:
+            old_rating = book.ratings[0].rating
+        ratingx2 = int(float(to_save["rating"]) * 2)
+        if ratingx2 != old_rating:
+            changed = True
+            is_rating = db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
+            if is_rating:
+                book.ratings.append(is_rating)
+            else:
+                new_rating = db.Ratings(rating=ratingx2)
+                book.ratings.append(new_rating)
+            if old_rating:
+                book.ratings.remove(book.ratings[0])
+    else:
+        if len(book.ratings) > 0:
+            book.ratings.remove(book.ratings[0])
+            changed = True
+    return changed
+
+
+def edit_book_languages(to_save, book):
+    input_languages = to_save["languages"].split(',')
+    unknown_languages = []
+    input_l = isoLanguages.get_language_codes(get_locale(), input_languages, unknown_languages)
+    for l in unknown_languages:
+        log.error('%s is not a valid language', l)
+        flash(_(u"%(langname)s is not a valid language", langname=l), category="error")
+    return modify_database_object(list(input_l), book.languages, db.Languages, db.session, 'languages')
+
+
+def edit_book_publisher(to_save, book):
+    changed = False
+    if to_save["publisher"]:
+        publisher = to_save["publisher"].rstrip().strip()
+        if len(book.publishers) == 0 or (len(book.publishers) > 0 and publisher != book.publishers[0].name):
+            changed |= modify_database_object([publisher], book.publishers, db.Publishers, db.session, 'publisher')
+    elif len(book.publishers):
+        changed |= modify_database_object([], book.publishers, db.Publishers, db.session, 'publisher')
+    return changed
+
+
 def edit_cc_data(book_id, book, to_save):
+    changed = False
     cc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
     for c in cc:
         cc_string = "custom_column_" + str(c.id)
@@ -286,14 +334,17 @@ def edit_cc_data(book_id, book, to_save):
                         if cc_db_value is not None:
                             if to_save[cc_string] is not None:
                                 setattr(getattr(book, cc_string)[0], 'value', to_save[cc_string])
+                                changed = True
                             else:
                                 del_cc = getattr(book, cc_string)[0]
                                 getattr(book, cc_string).remove(del_cc)
                                 db.session.delete(del_cc)
+                                changed = True
                         else:
                             cc_class = db.cc_classes[c.id]
                             new_cc = cc_class(value=to_save[cc_string], book=book_id)
                             db.session.add(new_cc)
+                            changed = True
 
                 else:
                     if c.datatype == 'rating':
@@ -305,6 +356,7 @@ def edit_cc_data(book_id, book, to_save):
                             getattr(book, cc_string).remove(del_cc)
                             if len(del_cc.books) == 0:
                                 db.session.delete(del_cc)
+                                changed = True
                         cc_class = db.cc_classes[c.id]
                         new_cc = db.session.query(cc_class).filter(
                             cc_class.value == to_save[cc_string].strip()).first()
@@ -312,6 +364,7 @@ def edit_cc_data(book_id, book, to_save):
                         if new_cc is None:
                             new_cc = cc_class(value=to_save[cc_string].strip())
                             db.session.add(new_cc)
+                            changed = True
                             db.session.flush()
                             new_cc = db.session.query(cc_class).filter(
                                 cc_class.value == to_save[cc_string].strip()).first()
@@ -324,12 +377,13 @@ def edit_cc_data(book_id, book, to_save):
                     getattr(book, cc_string).remove(del_cc)
                     if not del_cc.books or len(del_cc.books) == 0:
                         db.session.delete(del_cc)
+                        changed = True
         else:
             input_tags = to_save[cc_string].split(',')
             input_tags = list(map(lambda it: it.strip(), input_tags))
-            modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session,
+            changed |= modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session,
                                    'custom')
-    return cc
+    return changed
 
 def upload_single_file(request, book, book_id):
     # Check and handle Uploaded file
@@ -404,6 +458,7 @@ def upload_cover(request, book):
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
+    modif_date = False
     # Show form
     if request.method != 'POST':
         return render_edit_book(book_id)
@@ -421,6 +476,7 @@ def edit_book(book_id):
     meta = upload_single_file(request, book, book_id)
     if upload_cover(request, book) is True:
         book.has_cover = 1
+        modif_date = True
     try:
         to_save = request.form.to_dict()
         merge_metadata(to_save, meta)
@@ -432,6 +488,7 @@ def edit_book(book_id):
                 to_save["book_title"] = _(u'Unknown')
             book.title = to_save["book_title"].rstrip().strip()
             edited_books_id = book.id
+            modif_date = True
 
         # handle author(s)
         input_authors = to_save["author_name"].split('&')
@@ -440,7 +497,7 @@ def edit_book(book_id):
         if input_authors == ['']:
             input_authors = [_(u'Unknown')]  # prevent empty Author
 
-        modify_database_object(input_authors, book.authors, db.Authors, db.session, 'author')
+        modif_date |= modify_database_object(input_authors, book.authors, db.Authors, db.session, 'author')
 
         # Search for each author if author is in database, if not, authorname and sorted authorname is generated new
         # everything then is assembled for sorted author field in database
@@ -456,7 +513,7 @@ def edit_book(book_id):
         if book.author_sort != sort_authors:
             edited_books_id = book.id
             book.author_sort = sort_authors
-
+            modif_date = True
 
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
@@ -469,79 +526,60 @@ def edit_book(book_id):
             if to_save["cover_url"]:
                 if helper.save_cover_from_url(to_save["cover_url"], book.path) is True:
                     book.has_cover = 1
+                    modif_date = True
                 else:
                     flash(_(u"Cover is not a jpg file, can't save"), category="error")
 
             if book.series_index != to_save["series_index"]:
                 book.series_index = to_save["series_index"]
+                modif_date = True
 
             # Handle book comments/description
             if len(book.comments):
-                book.comments[0].text = to_save["description"]
+                if book.comments[0].text != to_save["description"]:
+                    book.comments[0].text = to_save["description"]
+                    modif_date = True
             else:
-                book.comments.append(db.Comments(text=to_save["description"], book=book.id))
+                if to_save["description"]:
+                    book.comments.append(db.Comments(text=to_save["description"], book=book.id))
+                    modif_date = True
 
-            # Handle identifiers
+                    # Handle identifiers
             input_identifiers = identifier_list(to_save, book)
-            modify_identifiers(input_identifiers, book.identifiers, db.session)
+            modif_date |= modify_identifiers(input_identifiers, book.identifiers, db.session)
 
             # Handle book tags
             input_tags = to_save["tags"].split(',')
             input_tags = list(map(lambda it: it.strip(), input_tags))
-            modify_database_object(input_tags, book.tags, db.Tags, db.session, 'tags')
+            modif_date |= modify_database_object(input_tags, book.tags, db.Tags, db.session, 'tags')
 
             # Handle book series
             input_series = [to_save["series"].strip()]
             input_series = [x for x in input_series if x != '']
-            modify_database_object(input_series, book.series, db.Series, db.session, 'series')
+            modif_date |= modify_database_object(input_series, book.series, db.Series, db.session, 'series')
 
             if to_save["pubdate"]:
                 try:
-                    book.pubdate = datetime.datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+                    book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
                 except ValueError:
                     book.pubdate = db.Books.DEFAULT_PUBDATE
             else:
                 book.pubdate = db.Books.DEFAULT_PUBDATE
 
-            if to_save["publisher"]:
-                publisher = to_save["publisher"].rstrip().strip()
-                if len(book.publishers) == 0 or (len(book.publishers) > 0 and publisher != book.publishers[0].name):
-                    modify_database_object([publisher], book.publishers, db.Publishers, db.session, 'publisher')
-            elif len(book.publishers):
-                modify_database_object([], book.publishers, db.Publishers, db.session, 'publisher')
-
+            # handle book publisher
+            modif_date |= edit_book_publisher(to_save, book)
 
             # handle book languages
-            input_languages = to_save["languages"].split(',')
-            unknown_languages = []
-            input_l = isoLanguages.get_language_codes(get_locale(), input_languages, unknown_languages)
-            for l in unknown_languages:
-                log.error('%s is not a valid language', l)
-                flash(_(u"%(langname)s is not a valid language", langname=l), category="error")
-            modify_database_object(list(input_l), book.languages, db.Languages, db.session, 'languages')
+            modif_date |= edit_book_languages(to_save, book)
 
             # handle book ratings
-            if to_save["rating"].strip():
-                old_rating = False
-                if len(book.ratings) > 0:
-                    old_rating = book.ratings[0].rating
-                ratingx2 = int(float(to_save["rating"]) * 2)
-                if ratingx2 != old_rating:
-                    is_rating = db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
-                    if is_rating:
-                        book.ratings.append(is_rating)
-                    else:
-                        new_rating = db.Ratings(rating=ratingx2)
-                        book.ratings.append(new_rating)
-                    if old_rating:
-                        book.ratings.remove(book.ratings[0])
-            else:
-                if len(book.ratings) > 0:
-                    book.ratings.remove(book.ratings[0])
+            modif_date |= edit_book_ratings(to_save, book)
 
             # handle cc data
-            edit_cc_data(book_id, book, to_save)
+            modif_date |= edit_cc_data(book_id, book, to_save)
 
+            if modif_date:
+                book.last_modified = datetime.utcnow()
             db.session.commit()
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
@@ -703,8 +741,9 @@ def upload():
 
             # 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, 1, 1),
-                               series_index, datetime.datetime.now(), path, has_cover, db_author, [], db_language)
+            # Calibre adds books with utc as timezone
+            db_book = db.Books(title, "", db_author.sort, datetime.utcnow(), datetime(101, 1, 1),
+                               series_index, datetime.utcnow(), path, has_cover, db_author, [], db_language)
             db_book.authors.append(db_author)
             if db_series:
                 db_book.series.append(db_series)
diff --git a/cps/web.py b/cps/web.py
index 794a8aca..ecf080d2 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -23,7 +23,7 @@
 from __future__ import division, print_function, unicode_literals
 import os
 import base64
-import datetime
+from datetime import datetime
 import json
 import mimetypes
 import traceback
@@ -967,14 +967,14 @@ def advanced_search():
         if pub_start:
             try:
                 searchterm.extend([_(u"Published after ") +
-                                   format_date(datetime.datetime.strptime(pub_start, "%Y-%m-%d"),
+                                   format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
                                                format='medium', locale=get_locale())])
             except ValueError:
                 pub_start = u""
         if pub_end:
             try:
                 searchterm.extend([_(u"Published before ") +
-                                   format_date(datetime.datetime.strptime(pub_end, "%Y-%m-%d"),
+                                   format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
                                                format='medium', locale=get_locale())])
             except ValueError:
                 pub_start = u""
@@ -1358,7 +1358,7 @@ def verify_token(token):
         return redirect(url_for('web.index'))
 
     # Token expired
-    if datetime.datetime.now() > auth_token.expiration:
+    if datetime.now() > auth_token.expiration:
         ub.session.delete(auth_token)
         ub.session.commit()
 
@@ -1390,7 +1390,7 @@ def token_verified():
         data['message'] = _(u"Token not found")
 
     # Token expired
-    elif datetime.datetime.now() > auth_token.expiration:
+    elif datetime.now() > auth_token.expiration:
         ub.session.delete(auth_token)
         ub.session.commit()
 

From 06c15a792e5254b76bbad893739a7563822b4015 Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Tue, 21 Apr 2020 23:36:47 -0400
Subject: [PATCH 22/38] Minor fixes to the Kobo shelves implementation (mostly
 typos)

---
 cps/kobo.py  | 10 +++++-----
 cps/shelf.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cps/kobo.py b/cps/kobo.py
index ee0aa810..8be76f8a 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -407,7 +407,7 @@ def HandleTagCreate():
         log.debug("Received malformed v1/library/tags request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Name' or 'Items' field")
 
-    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.name) == name, ub.Shelf.user_id ==
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.name == name, ub.Shelf.user_id ==
                                               current_user.id).one_or_none()
     if shelf and not shelf_lib.check_shelf_edit_permissions(shelf):
         abort(401, description="User is unauthaurized to edit shelf.")
@@ -426,7 +426,7 @@ def HandleTagCreate():
 
 @kobo.route("/v1/library/tags/<tag_id>", methods=["DELETE", "PUT"])
 def HandleTagUpdate(tag_id):
-    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.uuid) == tag_id,
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.uuid == tag_id,
                                               ub.Shelf.user_id == current_user.id).one_or_none()
     if not shelf:
         log.debug("Received Kobo tag update request on a collection unknown to CalibreWeb")
@@ -487,7 +487,7 @@ def HandleTagAddItem(tag_id):
         log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
 
-    shelf = ub.session.query(ub.Shelf).filter(and_(ub.Shelf.uuid) == tag_id,
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.uuid == tag_id,
                                               ub.Shelf.user_id == current_user.id).one_or_none()
     if not shelf:
         log.debug("Received Kobo request on a collection unknown to CalibreWeb")
@@ -498,7 +498,7 @@ def HandleTagAddItem(tag_id):
 
     items_unknown_to_calibre = add_items_to_shelf(items, shelf)
     if items_unknown_to_calibre:
-        log.debug("Received request to add an unknown book to a collecition. Silently ignoring item.")
+        log.debug("Received request to add an unknown book to a collection. Silently ignoring item.")
 
     ub.session.merge(shelf)
     ub.session.commit()
@@ -600,7 +600,7 @@ def create_kobo_tag(shelf):
         book = db.session.query(db.Books).filter(db.Books.id == book_shelf.book_id).one_or_none()
         if not book:
             log.info(u"Book (id: %s) in BookShelf (id: %s) not found in book database",  book_shelf.book_id, shelf.id)
-            return None
+            continue
         tag["Items"].append(
             {
                 "RevisionId": book.uuid,
diff --git a/cps/shelf.py b/cps/shelf.py
index 4924a186..7d79724e 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -240,7 +240,7 @@ def create_shelf():
 @login_required
 def edit_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    if request.method == "POST":            
+    if request.method == "POST":
         to_save = request.form.to_dict()
 
         is_shelf_name_unique = False

From 9296d35517493ee928a29f04f903315e15fb43ef Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Tue, 21 Apr 2020 23:57:20 -0400
Subject: [PATCH 23/38] Fix bug with shelf deletions for Kobo.

We were incorrectly setting the user_id field in the ShelfArchive table
---
 cps/shelf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/shelf.py b/cps/shelf.py
index 7d79724e..2801b9b6 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -283,7 +283,7 @@ def delete_shelf_helper(cur_shelf):
     shelf_id = cur_shelf.id
     ub.session.delete(cur_shelf)
     ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
-    ub.session.add(ub.ShelfArchive(uuid = cur_shelf.uuid, user_id = cur_shelf.uuid))
+    ub.session.add(ub.ShelfArchive(uuid = cur_shelf.uuid, user_id = cur_shelf.user_id))
     ub.session.commit()
     log.info("successfully deleted %s", cur_shelf)
 

From 742ec2b38d59637a12697880fda6bc98ab6b3d4c Mon Sep 17 00:00:00 2001
From: Michael Shavit <mshavit@google.com>
Date: Wed, 22 Apr 2020 00:19:33 -0400
Subject: [PATCH 24/38] Fix issue with the delete_book changes introduced in
 41a3623

---
 cps/editbooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 28a8d2a6..8ac7b2c8 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -179,7 +179,7 @@ def delete_book(book_id, book_format):
                 # delete book from Shelfs, Downloads, Read list
                 ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
                 ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id).delete()
-                ub.session.query(ub.ArchivedBook).filter(ub.ReadBook.book_id == book_id).delete()
+                ub.session.query(ub.ArchivedBook).filter(ub.ArchivedBook.book_id == book_id).delete()
                 ub.delete_download(book_id)
                 ub.session.commit()
 

From 8b8fe7a0ae9a13058a3e774bc6a20d5f297edb71 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Apr 2020 14:56:51 +0200
Subject: [PATCH 25/38] bugfix on create shelv via kobo sync protocol bugfix
 for totally wrong json requests prevent empty shelf names on kobo create
 shelf Removed errorhandler 404

---
 cps/kobo.py   | 159 ++++++++++++++++++++++++++++----------------------
 cps/server.py |   2 +-
 2 files changed, 89 insertions(+), 72 deletions(-)
 mode change 100755 => 100644 cps/server.py

diff --git a/cps/kobo.py b/cps/kobo.py
index 47d0f026..8f14bf7f 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -45,6 +45,7 @@ from flask_login import current_user, login_required
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
+from sqlalchemy.exc import StatementError
 import requests
 
 from . import config, logger, kobo_auth, db, helper, shelf as shelf_lib, ub
@@ -222,10 +223,10 @@ def HandleSyncRequest():
     sync_token.archive_last_modified = new_archived_last_modified
     sync_token.reading_state_last_modified = new_reading_state_last_modified
 
-    return generate_sync_response(request, sync_token, sync_results)
+    return generate_sync_response(sync_token, sync_results)
 
 
-def generate_sync_response(request, sync_token, sync_results):
+def generate_sync_response(sync_token, sync_results):
     extra_headers = {}
     if config.config_kobo_proxy:
         # Merge in sync results from the official Kobo store.
@@ -394,26 +395,31 @@ def get_metadata(book):
     return metadata
 
 
-@kobo.route("/v1/library/tags", methods=["POST"])
+@kobo.route("/v1/library/tags", methods=["POST", "DELETE"])
 @login_required
 # Creates a Shelf with the given items, and returns the shelf's uuid.
 def HandleTagCreate():
-    shelf_request = request.json
+    # catch delete requests, otherwise the are handeld in the book delete handler
+    if request.method == "DELETE":
+        abort(405)
     name, items = None, None
     try:
+        shelf_request = request.json
         name = shelf_request["Name"]
         items = shelf_request["Items"]
-    except KeyError:
+        if not name:
+            raise TypeError
+    except (KeyError, TypeError):
         log.debug("Received malformed v1/library/tags request.")
-        abort(400, description="Malformed tags POST request. Data is missing 'Name' or 'Items' field")
+        abort(400, description="Malformed tags POST request. Data has empty 'Name', missing 'Name' or 'Items' field")
 
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.name == name, ub.Shelf.user_id ==
                                               current_user.id).one_or_none()
     if shelf and not shelf_lib.check_shelf_edit_permissions(shelf):
-        abort(401, description="User is unauthaurized to edit shelf.")
+        abort(401, description="User is unauthaurized to create shelf.")
 
     if not shelf:
-        shelf = ub.Shelf(user_id=current_user.id, name=name, uuid=uuid.uuid4())
+        shelf = ub.Shelf(user_id=current_user.id, name=name, uuid=str(uuid.uuid4()))
         ub.session.add(shelf)
 
     items_unknown_to_calibre = add_items_to_shelf(items, shelf)
@@ -441,18 +447,17 @@ def HandleTagUpdate(tag_id):
     if request.method == "DELETE":
         shelf_lib.delete_shelf_helper(shelf)
     else:
-        shelf_request = request.json
         name = None
         try:
+            shelf_request = request.json
             name = shelf_request["Name"]
-        except KeyError:
+        except (KeyError, TypeError):
             log.debug("Received malformed v1/library/tags rename request.")
             abort(400, description="Malformed tags POST request. Data is missing 'Name' field")
 
         shelf.name = name
         ub.session.merge(shelf)
         ub.session.commit()
-
     return make_response(' ', 200)
 
 
@@ -461,29 +466,32 @@ def add_items_to_shelf(items, shelf):
     book_ids_already_in_shelf = set([book_shelf.book_id for book_shelf in shelf.books])
     items_unknown_to_calibre = []
     for item in items:
-        if item["Type"] != "ProductRevisionTagItem":
-            items_unknown_to_calibre.append(item)
-            continue
-
-        book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
-        if not book:
+        try:
+            if item["Type"] != "ProductRevisionTagItem":
+                items_unknown_to_calibre.append(item)
+                continue
+
+            book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
+            if not book:
+                items_unknown_to_calibre.append(item)
+                continue
+
+            book_id = book.id
+            if book_id not in book_ids_already_in_shelf:
+                shelf.books.append(ub.BookShelf(book_id=book_id))
+        except KeyError:
             items_unknown_to_calibre.append(item)
-            continue
-
-        book_id = book.id
-        if book_id not in book_ids_already_in_shelf:
-            shelf.books.append(ub.BookShelf(book_id=book_id))
     return items_unknown_to_calibre
 
 
 @kobo.route("/v1/library/tags/<tag_id>/items", methods=["POST"])
 @login_required
 def HandleTagAddItem(tag_id):
-    tag_request = request.json
     items = None
     try:
+        tag_request = request.json
         items = tag_request["Items"]
-    except KeyError:
+    except (KeyError, TypeError):
         log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
 
@@ -509,15 +517,14 @@ def HandleTagAddItem(tag_id):
 @kobo.route("/v1/library/tags/<tag_id>/items/delete", methods=["POST"])
 @login_required
 def HandleTagRemoveItem(tag_id):
-    tag_request = request.json
     items = None
     try:
+        tag_request = request.json
         items = tag_request["Items"]
-    except KeyError:
+    except (KeyError, TypeError):
         log.debug("Received malformed v1/library/tags/<tag_id>/items/delete request.")
         abort(400, description="Malformed tags POST request. Data is missing 'Items' field")
 
-    # insconsitent to above requests
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.uuid == tag_id,
                                               ub.Shelf.user_id == current_user.id).one_or_none()
     if not shelf:
@@ -530,16 +537,19 @@ def HandleTagRemoveItem(tag_id):
 
     items_unknown_to_calibre = []
     for item in items:
-        if item["Type"] != "ProductRevisionTagItem":
-            items_unknown_to_calibre.append(item)
-            continue
+        try:
+            if item["Type"] != "ProductRevisionTagItem":
+                items_unknown_to_calibre.append(item)
+                continue
 
-        book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
-        if not book:
-            items_unknown_to_calibre.append(item)
-            continue
+            book = db.session.query(db.Books).filter(db.Books.uuid == item["RevisionId"]).one_or_none()
+            if not book:
+                items_unknown_to_calibre.append(item)
+                continue
 
-        shelf.books.filter(ub.BookShelf.book_id == book.id).delete()
+            shelf.books.filter(ub.BookShelf.book_id == book.id).delete()
+        except KeyError:
+            items_unknown_to_calibre.append(item)
     ub.session.commit()
 
     if items_unknown_to_calibre:
@@ -628,39 +638,43 @@ def HandleStateRequest(book_uuid):
     else:
         update_results_response = {"EntitlementId": book_uuid}
 
-        request_data = request.json
-        if "ReadingStates" not in request_data:
+        try:
+            request_data = request.json
+            request_reading_state = request_data["ReadingStates"][0]
+
+            request_bookmark = request_reading_state["CurrentBookmark"]
+            if request_bookmark:
+                current_bookmark = kobo_reading_state.current_bookmark
+                current_bookmark.progress_percent = request_bookmark["ProgressPercent"]
+                current_bookmark.content_source_progress_percent = request_bookmark["ContentSourceProgressPercent"]
+                location = request_bookmark["Location"]
+                if location:
+                    current_bookmark.location_value = location["Value"]
+                    current_bookmark.location_type = location["Type"]
+                    current_bookmark.location_source = location["Source"]
+                update_results_response["CurrentBookmarkResult"] = {"Result": "Success"}
+
+            request_statistics = request_reading_state["Statistics"]
+            if request_statistics:
+                statistics = kobo_reading_state.statistics
+                statistics.spent_reading_minutes = int(request_statistics["SpentReadingMinutes"])
+                statistics.remaining_time_minutes = int(request_statistics["RemainingTimeMinutes"])
+                update_results_response["StatisticsResult"] = {"Result": "Success"}
+
+            request_status_info = request_reading_state["StatusInfo"]
+            if request_status_info:
+                book_read = kobo_reading_state.book_read_link
+                new_book_read_status = get_ub_read_status(request_status_info["Status"])
+                if new_book_read_status == ub.ReadBook.STATUS_IN_PROGRESS \
+                    and new_book_read_status != book_read.read_status:
+                    book_read.times_started_reading += 1
+                    book_read.last_time_started_reading = datetime.datetime.utcnow()
+                book_read.read_status = new_book_read_status
+                update_results_response["StatusInfoResult"] = {"Result": "Success"}
+        except (KeyError, TypeError, ValueError, StatementError):
+            log.debug("Received malformed v1/library/<book_uuid>/state request.")
+            ub.session.rollback()
             abort(400, description="Malformed request data is missing 'ReadingStates' key")
-        request_reading_state = request_data["ReadingStates"][0]
-
-        request_bookmark = request_reading_state.get("CurrentBookmark")
-        if request_bookmark:
-            current_bookmark = kobo_reading_state.current_bookmark
-            current_bookmark.progress_percent = request_bookmark.get("ProgressPercent")
-            current_bookmark.content_source_progress_percent = request_bookmark.get("ContentSourceProgressPercent")
-            location = request_bookmark.get("Location")
-            if location:
-                current_bookmark.location_value = location.get("Value")
-                current_bookmark.location_type = location.get("Type")
-                current_bookmark.location_source = location.get("Source")
-            update_results_response["CurrentBookmarkResult"] = {"Result": "Success"}
-
-        request_statistics = request_reading_state.get("Statistics")
-        if request_statistics:
-            statistics = kobo_reading_state.statistics
-            statistics.spent_reading_minutes = request_statistics.get("SpentReadingMinutes")
-            statistics.remaining_time_minutes = request_statistics.get("RemainingTimeMinutes")
-            update_results_response["StatisticsResult"] = {"Result": "Success"}
-
-        request_status_info = request_reading_state.get("StatusInfo")
-        if request_status_info:
-            book_read = kobo_reading_state.book_read_link
-            new_book_read_status = get_ub_read_status(request_status_info.get("Status"))
-            if new_book_read_status == ub.ReadBook.STATUS_IN_PROGRESS and new_book_read_status != book_read.read_status:
-                book_read.times_started_reading += 1
-                book_read.last_time_started_reading = datetime.datetime.utcnow()
-            book_read.read_status = new_book_read_status
-            update_results_response["StatusInfoResult"] = {"Result": "Success"}
 
         ub.session.merge(kobo_reading_state)
         ub.session.commit()
@@ -691,8 +705,8 @@ def get_ub_read_status(kobo_read_status):
 
 
 def get_or_create_reading_state(book_id):
-    book_read = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.book_id == book_id,
-                                                          ub.ReadBook.user_id == current_user.id)).one_or_none()
+    book_read = ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id,
+                                                          ub.ReadBook.user_id == current_user.id).one_or_none()
     if not book_read:
         book_read = ub.ReadBook(user_id=current_user.id, book_id=book_id)
     if not book_read.kobo_reading_state:
@@ -840,12 +854,15 @@ def HandleProductsRequest(dummy=None):
     return redirect_or_proxy_request()
 
 
-@kobo.app_errorhandler(404)
+'''@kobo.errorhandler(404)
 def handle_404(err):
     # This handler acts as a catch-all for endpoints that we don't have an interest in
     # implementing (e.g: v1/analytics/gettests, v1/user/recommendations, etc)
+    if err:
+        print('404')
+        return jsonify(error=str(err)), 404
     log.debug("Unknown Request received: %s, method: %s, data: %s", request.base_url, request.method, request.data)
-    return redirect_or_proxy_request()
+    return redirect_or_proxy_request()'''
 
 
 def make_calibre_web_auth_response():
diff --git a/cps/server.py b/cps/server.py
old mode 100755
new mode 100644
index 14e1d9d2..d2253ab2
--- a/cps/server.py
+++ b/cps/server.py
@@ -24,7 +24,7 @@ import signal
 import socket
 
 try:
-    from gevent.pywtsgi import WSGIServer
+    from gevent.pywsgi import WSGIServer
     from gevent.pool import Pool
     from gevent import __version__ as _version
     VERSION = 'Gevent ' + _version

From 0480d493cf912f9d7caae39db0e350518ff3fc20 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Apr 2020 21:12:07 +0200
Subject: [PATCH 26/38] Fix opds login with ldap, if ldap server is down

---
 cps/web.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index ffa6a97c..5a90ae34 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -39,7 +39,7 @@ from flask_babel import gettext as _
 from flask_login import login_user, logout_user, login_required, current_user
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.sql.expression import text, func, true, false, not_, and_, exists, or_
-from werkzeug.exceptions import default_exceptions
+from werkzeug.exceptions import default_exceptions, FailedDependency
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
@@ -111,6 +111,14 @@ for ex in default_exceptions:
     elif ex == 500:
         app.register_error_handler(ex, internal_error)
 
+
+# Only way of catching the LDAPException upon logging in with LDAP server down
+@app.errorhandler(services.ldap.LDAPException)
+def handle_exception(e):
+    log.debug('LDAP server not accessible while trying to login to opds feed')
+    return error_http(FailedDependency())
+
+
 web = Blueprint('web', __name__)
 log = logger.create()
 
@@ -156,7 +164,7 @@ def load_user_from_auth_header(header_val):
     except (TypeError, UnicodeDecodeError, binascii.Error):
         pass
     user = _fetch_user_by_name(basic_username)
-    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
+    if user and config.config_login_type == constants.LOGIN_LDAP and services.ldap:
         if services.ldap.bind_user(str(user.password), basic_password):
             return user
     if user and check_password_hash(str(user.password), basic_password):

From 7b789b370172d0087d1ff9f0734c5f3a01c33529 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Apr 2020 08:40:53 +0200
Subject: [PATCH 27/38] Fix opds with shelves Fix errorhandler ldap without
 ldap

---
 cps/opds.py                       |   4 +-
 cps/web.py                        |  11 +-
 test/Calibre-Web TestSummary.html | 167 ++++++++++++++++++++++--------
 3 files changed, 129 insertions(+), 53 deletions(-)

diff --git a/cps/opds.py b/cps/opds.py
index 3085b7de..cd83709a 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -344,12 +344,12 @@ def feed_shelf(book_id):
     off = request.args.get("offset") or 0
     if current_user.is_anonymous:
         shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1,
-                                                  ub.Shelf.id == book_id, not ub.Shelf.deleted).first()
+                                                  ub.Shelf.id == book_id).first()
     else:
         shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
                                                            ub.Shelf.id == book_id),
                                                       and_(ub.Shelf.is_public == 1,
-                                                           ub.Shelf.id == book_id)), not ub.Shelf.deleted).first()
+                                                           ub.Shelf.id == book_id))).first()
     result = list()
     # user is allowed to access shelf
     if shelf:
diff --git a/cps/web.py b/cps/web.py
index 5a90ae34..e4f75cc7 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -112,11 +112,12 @@ for ex in default_exceptions:
         app.register_error_handler(ex, internal_error)
 
 
-# Only way of catching the LDAPException upon logging in with LDAP server down
-@app.errorhandler(services.ldap.LDAPException)
-def handle_exception(e):
-    log.debug('LDAP server not accessible while trying to login to opds feed')
-    return error_http(FailedDependency())
+if feature_support['ldap']:
+    # Only way of catching the LDAPException upon logging in with LDAP server down
+    @app.errorhandler(services.ldap.LDAPException)
+    def handle_exception(e):
+        log.debug('LDAP server not accessible while trying to login to opds feed')
+        return error_http(FailedDependency())
 
 
 web = Blueprint('web', __name__)
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
index b39857b4..67599b8a 100755
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-18 10:46:25</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-25 21:22:13</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-18 11:34:54</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-25 22:12:24</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>41:54 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>42:25 min</p>
         </div>
       </div>
       </div>
@@ -975,53 +975,30 @@
 
     <tr class="result['header']['style']">
         <td>test_kobo_sync.test_kobo_sync</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</td>
+        <td class="text-center">8</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 3)">Detail</a>
+            <a onclick="showClassDetail('c8', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='ft8.1' class='none bg-danger'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_sync</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft8.1' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft8.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 89, in test_check_sync
-    self.assertEqual(r.json()['Resources']['image_url_quality_template'], self.kobo_adress+"/{ImageId}/{width}/{height}/image.jpg")
-AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' != 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/{width}/{height}/image.jpg'
-- http://192.168.188.33:8083/kobo/8e590a265c2703d57c660b93b6ebdafa/{ImageId}/image.jpg
-+ http://192.168.188.33:8083/kobo/8e590a265c2703d57c660b93b6ebdafa/{ImageId}/{width}/{height}/image.jpg
-?                                                                            +++++++++++++++++</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>test_kobo_about</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_kobo_about</div>
+                <div class='testcase'>test_shelves_add_remove_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1029,6 +1006,15 @@ AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' !=
     
     
         <tr id='pt8.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_sync_changed_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_invalid</div>
             </td>
@@ -1036,17 +1022,53 @@ AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' !=
         </tr>
     
     
+    
+        <tr id='pt8.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_sync_reading_state</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_sync_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_sync_unchanged</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt8.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_sync_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr class="result['header']['style']">
         <td>test_ldap.test_ldap_login</td>
-        <td class="text-center">8</td>
-        <td class="text-center">8</td>
+        <td class="text-center">9</td>
+        <td class="text-center">9</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 8)">Detail</a>
+            <a onclick="showClassDetail('c9', 9)">Detail</a>
         </td>
     </tr>
 
@@ -1123,6 +1145,15 @@ AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' !=
         </tr>
     
     
+    
+        <tr id='pt9.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_ldap_opds_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr class="result['header']['style']">
@@ -1209,7 +1240,7 @@ AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' !=
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_logging.py", line 136, in test_logfile_recover
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_logging.py", line 137, in test_logfile_recover
     self.assertTrue(logpath=="", "logfile config value is not empty after reseting to default")
 AssertionError: False is not true : logfile config value is not empty after reseting to default</pre>
                     </div>
@@ -1354,8 +1385,8 @@ AssertionError: False is not true : logfile config value is not empty after rese
     <tr class="result['header']['style']">
         <td>test_opds_feed.test_opds_feed</td>
         <td class="text-center">20</td>
-        <td class="text-center">20</td>
-        <td class="text-center">0</td>
+        <td class="text-center">19</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1509,11 +1540,31 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='ft13.17' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_opds_shelf_access</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_ft13.17' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_ft13.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_opds_feed.py", line 511, in test_opds_shelf_access
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2205,8 +2256,8 @@ AssertionError: False is not true : logfile config value is not empty after rese
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>186</td>
-        <td>177</td>
+        <td>192</td>
+        <td>183</td>
         <td>2</td>
         <td>0</td>
         <td>7</td>
@@ -2253,6 +2304,12 @@ AssertionError: False is not true : logfile config value is not empty after rese
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>backports-abc</th>
+              <td>0.5</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Flask</th>
               <td>1.1.2</td>
@@ -2283,6 +2340,12 @@ AssertionError: False is not true : logfile config value is not empty after rese
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>Jinja2</th>
+              <td>2.11.2</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>PyPDF2</th>
               <td>1.26.0</td>
@@ -2325,12 +2388,24 @@ AssertionError: False is not true : logfile config value is not empty after rese
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>Unidecode</th>
+              <td>1.1.1</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Wand</th>
               <td>0.5.9</td>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>Werkzeug</th>
+              <td>1.0.1</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>lxml</th>
               <td>4.5.0</td>
@@ -2339,7 +2414,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
           
             <tr>
               <th>Pillow</th>
-              <td>7.1.1</td>
+              <td>7.1.2</td>
               <td>test_edit_books</td>
             </tr>
           
@@ -2381,7 +2456,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
 </div>
 
 <script>
-    drawCircle(177, 2, 0, 7);
+    drawCircle(183, 2, 0, 7);
 </script>
 
 </div>

From 456550a943004d9bd8d39748c6e824c5c08b3f8e Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Apr 2020 11:34:10 +0200
Subject: [PATCH 28/38] Bugfix view shelfs on detiled page bugfix datetime in
 archive mode

---
 cps/templates/detail.html | 6 ++++--
 cps/web.py                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index d2a15d7b..8315a8f2 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -234,7 +234,7 @@
           </button>
           <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
             {% for shelf in g.shelves_access %}
-              {% if not shelf.id in books_shelfs %}
+              {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
                 <li>
                   <a href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
@@ -255,7 +255,9 @@
                    data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
-                  <span class="glyphicon glyphicon-remove"></span> {{shelf.name}}
+                  <span {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                        class="glyphicon glyphicon-remove"
+                        {% endif %}></span> {{shelf.name}}
                 </a>
               {% endif %}
             {%endfor%}
diff --git a/cps/web.py b/cps/web.py
index e4f75cc7..fa668133 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -441,7 +441,7 @@ def toggle_archived(book_id):
                                                                   ub.ArchivedBook.book_id == book_id)).first()
     if archived_book:
         archived_book.is_archived = not archived_book.is_archived
-        archived_book.last_modified = datetime.datetime.utcnow()
+        archived_book.last_modified = datetime.utcnow()
     else:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
         archived_book.is_archived = True

From 46c0ae3ccc4bc7313afa7eecc92676230f588abe Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Apr 2020 21:11:43 +0200
Subject: [PATCH 29/38] Revert accidently deleted nl translation strings

---
 cps/translations/nl/LC_MESSAGES/messages.mo | Bin 37418 -> 37187 bytes
 cps/translations/nl/LC_MESSAGES/messages.po | 522 +++++++++++---------
 2 files changed, 283 insertions(+), 239 deletions(-)

diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 8b611fdbb03a14812d9c9a105968a5ded8d5c69c..2c3687f04b7adfd283cfbf86789403c15d5aac6c 100644
GIT binary patch
delta 8666
zcmYM&2Xt3OzQFNIO&}qOA(T)91cZ>#ArOihL=cuH2#A0bsY+3iBFJC5AVm>GMMVX5
z4=VZ=k#&iPg6^X%E@$@z6cI(RENgi-6yf>4U+$c<o;~}SnLBr8e!rQy|LC@@W%oT>
zHt}(0`3({OR4W@rb#Q-%wg3EcdxI#lX)3nH1(=VoqWw=|E?&S)tluzhZ-Y71`(rZB
zz#DNc4#D@aQxqklCXJ$~BMqam0zQUGxEagg3s?hR#4B+hR>pIfia%o(mSYt@uZgx_
z9qfyaI~;v)bnrGzWBzCsg>)V)#d5d-FE0e0crzN=F0|i4bf6EhHl9U-iOMvNqAHk+
z_HTne?}6Dk2HW7g@O(RFF@N+n1yfpz&9PjQC?cCtOLX9Y=m0aZBCbKVWCNP1=h203
z$MX0dR>ebTzf+<8yWme~hAv>jNRr5#smtX5TtE@F!U^cYHewO(#}4>AR=^HTqo@G8
zU^AS8)o?w!plw(S-wE}TXdpjfT}*FA{_Rk}+rH2X({MCa#OdhsS$G9Lgl1+7I?%i5
zd#7*=o=4xiDKCmR7SU)lz$NH7YtgOQhGyW+Jo4{=2Wc=>|3)Xegx6p?=`aHW(TEqI
zd%OhO;X3razoNI}I681;Uh+`ZK>O!o3Kn4{ybeiXG$292J)VQEcoU}LTWBT@qYFBL
z4)8U42!BQQx)S-Xk7-yBTcG3hMKdu2eQ$PfF}g)-(Qy*bQE-BtXo~)d4tyGY@e54F
zA211{7I6g0m`pVj-GbW4nxeL$eKb1WWHjO>Xumb+);*8iz5jbDq|s2mWfWD%s%S)c
zXhglyi6*0|z7yTD#pptx!<x7ay>9!k3ZBBs_%#~wFX-N<ak34l0oL~Zx1eAKdZQ~F
zff+apUBGfQlIPKdzKst2cQmpSn1N@}Gx9TfHZEc@w&q|EX*4tVXYA&4%w+zkGhc-(
zupc_XXmo|s(TV1V=gZMOeGJ>;)4_jY6Y9w{YD@Hb4GGRfx<u>HfZjzjat0H9DO{l7
z#JyOyr*bH|6$xb9qerj@?#IShxqZBst<Z(`LIb!Fxj4~8bj#METeJxc<Y_chFQOSJ
zX;1!L*>5y>*jn&)aqo)I1@uCHWNtwhHXog6D`w&A=$;=6eu0Cimn#f`U^?{#x`4H4
z1|LV~d!~^58~MvLxYCl)@ojW(52F*5hW78#1zf@!n9eU(CSHl&jw0-g#pr|!&;_hO
z$9XKc6AkQWf`a${8#FbUo#NBn2%Vq{n##fG#3RuOr=ts8gl23NR>Q}`^H<TsxDO5N
z05-!T=sdrm<0UE;#Vf6iU1?~7MsO>-!l$t&zKKp)iq-KGbi(s!2CMLr6V^c^Z-}P4
z0KKm5(13=ZXJ#7mULu-DA)AJk=&9X`rt%$hfP>f^kD`%WLKjlDOWZFNt5VOxve*=z
zpgD5oqmF3AlQ0kGVh(P_V(<UE6bK?pCVa0)cXXn$Xk-)7foEYZ&PBKEDfE87gEwFW
zjx-l38iv>7Dl`+NI0QdMx3c3^@dB>FYRn&vrQk$!(A%&aTj5{O>vs<8VfNK=y(8A9
zJ^}M_5jMqF@H#w>22`J4FwSW-91Un4x`2)7nRyx$p3dzQbWiAT1da3<n%awK$}<Sp
zh1Npbo1urOE1Kf|p*|Yze<#{+KAMRK(XH8pZtWk<zxVhR8gzf?@Iml%^zi+Fo{3bx
zqYjXTM$`ZuxCwfnTcd$=MHkc;UGOM${Hei3Sd03`?umFW|3rhSDGeP?g$_Sr6WY_S
zjXx+I(9DcNCtQrZaBc87_N3l`&!r2Qj2`Z}XeJ&;19<@r<dp;kS6G5}JcM>U8|uHJ
zsjAAxx@Wb}dQ)@(EzyBGqXG0n`wc`hb4#dCLAPWMa`mG{=ov|rP;f=((E)zP@|a8*
zE~pAtz$?*#3(&|q2m7D_+>8}*N~qs~F6=(^z15h9o6tl49<l|A=vN92X~-gvPFRQz
zI1uaNXmsEOXaq~q571il@I8<2?Vr(%{0(#Q15C#MLo=Fmef$Bc9c+t@y#IYDIM8%V
z!iAx}0v%uzI^kAyVY|cggP248BXj|m&@W<U?|7o7=rz4M)JLF)c_upFYOK!u(Pjz`
z@OpS~2p#Ao8qp8vLVib*6(#qHe~t&BnRx`;;*+6%6#b1jjxP8dx`h|8GDd%h15Lrp
zfB#pd;6U}zy={yQust@$q3D^oH@FBLa5<*nYHW#*q1WyJ^0A9PMEhm;jTclO{jjw`
z7d);n`S&nvq#+LvqF=h7(Dtl;@t@T_(S^)K2i%ON@VVeFbm0erAD|2Q3Z3u*y0y*w
z#~EoGEbdSKjeH;tsW=SXqw#q8(1ngm(FLv#^|#Ok9>JzqW<cCO59?5Gja9H8UWp^n
zEnI?waWy*M=>!E=_AUCtc{H*L1LJxP^k=g%R>H36q3Vg=j&bPLEJXV)3qBQm9i8|H
znz>`>d?!PD;w*(LX!r&%AC4R1y-GnRtcT68Df;3K=s?5KPv~eYhx3ph(kOvuqy&xd
zEH=UKF%z=~#ewA`hdvP%g@*p<gd@=jCSn>+4bSIeS?Vj%tyzsmwm#IK#0=_N(FN^9
z7xD(~E<>u(1w3_Q{0Gi|VLR{t*A(jWpdmlfp88_6<E`jk&c+;Ek7j5mj>5gc`a`+n
z)EA%`cnj@!5zScAusE=E^h1}89k2^#c>nLBP!*S;DSb3_*b(agLcfd^Zi*wXk4D-A
zJu`*D9_Ydcp&6WjX6SY_kh`%Fu0#91jtTev0EK)!fsHYFcsxN1^h0zN`boVpcn=!E
zX7v41bigmM5Pu7{y*a+Vw_yv~pTrt?7~R4%H<N!OIY)!3x`?&0{D?SZIq1N7Xuqy#
zWc|=nKNvk^H=$=|0=C8(*cP9~PFRZVFk@u=bKL{^Bt&aQhWme#23LLteX$N3Tnh)F
z3%U)naXIGTGguGbK{N9y*2Rjq#P8)|P3l*n3mb+W=CPsu4s<J4CMfvgc65TnI0rvR
zU%X{>e2OQdk*>oW+>D-?y}^H?Tlghb$7*BZROe$)>epg7T!m)(5ISDs9~3%M_yp6j
z&REin`Dn_gppncA_4VkUKZhQ^U1)0GMfdmuw!&uP;_-$f_dJ?{E-Vq+A3-vbh@Pk5
zVc3Zcu>_6e6y{;-t?`dcA-bUM=++EIw`MweNFTsD_zbqhJ?QEG295MQy5RET;|yeC
zviH9h1yk7w>ti7{$D!ywUW|=#4Z0<-p@(b_8qs&?VM>}1FLVfc%Ew{>-h++skLUsp
zqk(*AJM%~9D7ez}iSZeziALB4jjS)4!f|*d&Oy)2)96HdumP5${eKD1(<a4Rm5**s
zH_XAQ=y+=|QI5hE3jU72fL^y9SRUWQ_IL<;V42C>2<#br6#G*D3e8~QlsK|J=$RRT
zo|U_?5-vykJ%ma4+!XTfwR@Qc56xLL_0?~SEk+}q7F>m%jcsU#j-dm7k5jSY?Qvu?
z(L=cc?Y9T7#Sic*tVd_h$f&90-$S&92KQten!?@atvHIwSY=uqL3K2BIl=Zgh<a~q
zgHK^)Jc?EDBlL{?3!SIT^mr@kqVxPALBRpXqA8n=c6<=8$Ct1L{*0!w@r-yOg;<gL
zHJFCI&~b)h3f>-^gBjG9poee++W!so{ltG$@YKJLzW6P=SHEFLtZ+yCLN`pO-WT1H
zk?7%@hhDpfF$Z78EAS{9&}V4Bi|Cokx-%Xp8(ByqYDS>~4?3bRc0*qnfG%uOcz!>+
z6>G39ZbbVX3Vw!})PKW1n08nEb37a!XCs=~U1)&+xZKYEpQMmV!zIkX$}{7MYNLCZ
zi@wkjn_?%dieoVgXQ6xi0GgR+(FymW3;qNh|0^uSpF?|#yU7IeM}-v3Ku>hwzUZ|a
zgGM+WJK()&N?*eQ{2Tfs^c!A<wPwZt(Rw(#*H54+--~AE-B3S{EvcVG|NC=PWp;ee
zi;zD7q8V6-2XQc#ofBtZDDuB(4F6|lK12`aS#%*;bK?xQMJKoxy?!&%1+T?id=q=(
z>ACE`5$D|#-`8&Fi+5oTZozACKX%88^WsePMo;em^qLJtBOH%eI0xOb)tHAHL;E}E
zRvbeQ^O<?%-v#_ggC@_9BdCK8RDkYbF*-pXbl_2F|4HbrnUC3cfAHC0Nw5?>6W^f=
z&bT+WUV?(3!hG~zwhIrsqZ157Z^iiFY;>X(!7Z3W{Y^AeAEOJ(SrGTj$6C~{Lo+)D
z&B#OO)+I_PxT14tihsra*p<w5!PQs?52A<a3#^YR_r<5aIeKe~Lwyjsz$s_|OVIkG
zXy*Qe22_Fso`{Z6NT;C`9q4m3<>%3bMGNDB($Ibl(ZkmUug0$EkJAD)ll#&44~P2y
zU;*`$=$T1b6fYnXvzR~1rQo6Hgw^mmwBragf^q1|X9pLex8niy6z@Y%b;{!S!_*3M
zsNaf?w-h})o6vx^qvMre1Llw3qhRD;q8)!l_b_!y{I6a$(FGQx&--I8j>X2f96R94
zSOd?X6J136S6&)ttS;82-W03jb(nB(Mp9^pvqOiM&^<bc-hz+N7ycLBg5+g!drkEH
z0yI-Su^!%xo{@XP^T*NmUqkyH!eTtNjQsbY&~SPDrJ989)l^KvO=t?YpcB6l+7F;9
zJR0gJ&<uTs74bXt(4NQUn00^r7t+<}^RZYSC*M#0D^Qq5gDIbh&G0^SOSWM@+>Q3D
zydsV`1G`ht!>%|DTjNXE3_r#;n7lI1Y-cnxGq5qPMaSEjpkPXNV{LpN-J^5pURHV_
ze%=60S$j;zIp_ix2G?N<^(~?P3g%MZi<R&!nxSv88(u^+n&`YL{`U95d>R&_6KqFU
zybC={rD$Ylurj8t=8p`_Mz?4gdS;#oZbt*yi!R_e`XM@vRqzsWMiNoVn)t)g9PQX2
z8{$pqA(|h20@J9MpesLw?&S&ez0>Ff|Hf2IS{pAc3%vz-*b2L1I!?nR@Bab{O=wt#
zW$|TfkFTOB{2U!1<-z!0ChK7u^<n6#o)}z!W@1Bl{vw*mzo1*ZFL(^gQ9tMN0t(+!
zNWovwh{`_{PmqFktc5P5-a|W9Hkj1v;kq~cxTDLUC(9(aDa>ipx~O%l9iI*!UbN%B
OwYg<>{Qbe<W&R)S_aWl|

delta 8867
zcmZ|Td3?`TzQ^%zB9RaY5)p~*Ckt5+S%ip+(9{}BqN+hF+8?nb5mAh)Z!A@`6-5nQ
zw1P3(NwuQ2q>GNFGdjxc#<WVUeW2WOdlenyzTP?K@wk87$L*t!d7kq<=X=iQe9k%F
zUpfb>ec#&R>z)qvd)eWi2w%r(gI_mO?SKDyp@ZY-(TkXZ8?iGUNA<slu^1KYIH8!0
zdY+FSEW<!tg%9Hf9F6~pnU3Q+55+i6PaagFKkmf<`~(}|XBdH>V<$Y1jWLK>n_x?9
zfibA|p7!|!YYA%Hd8qd)t<Pf!^E>M(G^JrHYQp!iJ`mKzpP*KD0@d#dYM{H=8vWxO
zhs8J@Fc=?1_0LDOdodChVk*9B+rPjT%<r6~pp@RiB#i0EU^pB#a5-v#wb&5fL2b$V
zs7xJ31^Na0;Ux^itEhhW?ek`&NA2OL%tfKAm2{%OzfLOuqW}uA8!kl!wi|ol1<b(q
z@g_r~u?zKan1CxV9Cx7tI)YJn&erdt77|Y9wwRni{?#Fm2YR6xL$DGXVil@=9X7}J
zP?<S^8t5YGz57^%5sBu#KOo1%sYESs3u>GlsI57I%D@ka<X;0`;ek@sgyn0ZwwQy-
zs0@^&KW;?r@fJ+Sov8PILfwwrsDTrCNr$ors{c?7!a{6>laOROGh7PV<MpVB>#zx)
zL1p4+R6xI@1_&nKI)ss^y-dLN*cIF1Fw}S@s0^+`z4u4!X4Dq#K#k)bqM!-BL8a&?
z)WE)7&5Hr3fWj~UJ*XALV<4uYwjc|M(J8RcD^cSuNA=%=>h}(6>keao-Txmcgzz9X
znY)Z>s1*%Ht!OH0qUESmuSRXzW>lbuuoWIbUAOZXjQ6oI26K|N;#R1=?}}Pb4z||)
zA4WkLn2L&QJ~qR3r~tO1R&p2>=vmajzo1t3J2pdq4uH-`OVrtDgZ*$MvQlTQ^(6LD
zJ0F8k=6A+YXpW_*2`W($R-q<(&9-kt?de`j!~ND@kt^=R^H2^)U9Z{JwMZ9dCu%_#
zQ5o?gN;i)}6a`IOj5?KbP+Rc^avYowFc&W%-zX=syV=VTs6dNR3wR2-NX~PpE!&CO
zqB_(<_M<ZOIVuCEx|4rJ)|#)1PU$ez-W8$(C`SF5xTwHhLrruLTi~~-J-=!V=)nP`
z9)tA@!KT#TKn1V^mBD?e`9AGI{<ZR>JW!;kY{#>xz5N+A!7ckdlwT?Z&=w;w8AEXZ
z>UI=j7EVM>xDge=cGNg~t>2&)cEhEhdmoZ%Qj?0UsP{)rFb<W<S*VGhK}}eN3a}cL
zvA<wA?z8R3QHSw7YGIc#0k5OBpj9t3o|`~Hk!Ilo_z-FZOHdK+M+Ni)YQkIC64gl)
zMxZj-1vO!B)Oh_+sm?=P*HNei%|@M>mB@Rp^D2c%9=wG*wFgnDJck<K3MSzV)Jod+
zHi1N=`gO)IOh;cFh?-ys@(FOppjNyL6LAB2@F4cn{l7?oMLF>-U)SRa)I^I=D|-$#
z@H&je4X7>q7<IqTVLrxjq`6tnTpWadL1p3=jz*tsvz24eL%j&YncrDNK@+V<-G*)0
z4ZlNOzo5P*uuN2a47SFl*cq!a9*^NecpJ5#>>Pf8a2{$wJ5gt8H|osnM^~rw3kveI
z?Qk8n(%(?2ZNoCP_uWu|_Ch@$ggTVtQ7JC7^-5I#)u?{2p)&C<YHR9HTl+WVU-$SJ
z599^g;f}Q--%TC9Fs$Ee)Bx$I73H7?eh77+N1_%o9u-gtD&PgE@n5u7V-)q>{av${
zU-Ceyxn(=tw;ftMXg;aQ*opSh7>f%~6K=+VxWjrI2T;$+HGwQg9qtXNOw^(l@)>F&
z$6N}E@D!@!Ra8fRHd6ISRI1WYd)CX=2ciNPjv8nzY5~Qle&wjlxVF9mwI%B@6RS~Y
z#63kp5k(NT2566d7>^2|3;N>#)WCVD6pyt|LoMKGY=|pt{UuajZ=&9-!9=V>9r8=a
z7Pw9%`HSX3I%>j4Py?1@TdYJ4yb-m6t*8&s4%Fd0jN03isEl00SiFOQ*lv)?XeZPM
zD9c)aF}nZLC}^N648Tpcz8y6{9csdZsKCCr?N`u4{a>g6+732f#8lKo15wv>g00U-
z9p<&D`D(Bw^E;nV&;Z}shO4Mg>pj$p!iLzbL9*t=Bge#<fy&GWn1&zO`VG`?#BEf-
zK|{?JMqy*>9@IjUu>SA=GzuE14{C37u>(GgaX1HcCSJEzqt3)O48j^r#=WR(cNzKU
zId@V0GV@G8*{Ba&J}ThFdE{S*VK)yF@d~!X@L}eVq+<&8$*4d!pa%Q|mBK^T6R5y1
zTkoI(X*AqS7=>E#5DdWr>%`&YUn?)?K@*&d+M{Q&{?OTuTTub-vh_2lz^`LGb{Jv$
z55_jsM`AFRVkexBI!jw{6xN{T^L0m>$eN;Fh(N6@&enUN4pS~R!ttm>H5qj~7NfRi
z6RO{ztRGvyMFoBx6+mRZ$zU`pBW^qeHFU$~n29<hLogIaqb8n$30Q%8@paTzY(;%a
z-^K=b82LeUj-VzEC@>jHMXh)&cEn-~)%~xcpp{pnZo#{@eh4-3SEz}8K<(Xm+kO*$
zsVkq_ss^ZqG`96HY(_l_6<89+V=~tH@GFX;y8kWsan7Ql6Q<)6*dEuTZowWTQs+C=
z-d;lwHh#opDhVH>o?(3%`%?cEm5J_SOuw0^%sqoz*s~a|`(H&N19ze#zKmgb7nRzO
zM@@SIsy+errF<H-@|RKXy@twUjkOLH_}@_(JcY{8In+X~q8mdYu+Vhuj5-6^*cnG+
z94<gjum$yDdLQ+P{oMKsY60P6&HF=96F-JMu-v*GQ>dTCt{66s{6|peH_oi25H(Q|
zDpfPFHO@n&Y#nOgH&Oj+Q7b!$x&=p2hwK=t|0&djmoN=mjW@r3Ls473bUgVVNTH4g
zd@~$BHc}}qKt*1NdT}*I;bBxjXE74*p$8)#Hy^H^sLVWqx}Nh<@4bSp@O@NZU!V^2
zN!K>~gxU&cf_X6(H9<d|i{nr)euFy2XHY8*EHVLvqs~l*buelRAH$aTJSx-GH~{xy
zA9Q^unpEeY1{{Q0I2xPcYJ32zQ7QiswUQgQ-uMZ#=dDqPuL~-*S*Sgpf!**8)Og3S
z1^$Qx<~sjv8=5?6Qql&s1xXl<si>7ajQXG~!ulT_R6u)CDL#VQnv1AI>f<%1JOY!c
zr=w2)lc<H3V6g80JPJB&%WQ{Ls8nvi_E>{Scog+zyn}J*H_2>CBI=N(qf$Kyb(Wq%
z1^N$E>Q7=9`~_pM-DCn_ey1M=tz-nMp$HY}v#2w$61BoVqgHkRmBN2wC%le2Y%Pn;
zMCsUp`cPE=QdIjA)b*}LZOtxpJrvGU(13nZ%%?IE6?t3KbxS}$?2X+q2Xk=_j=+zs
zAyfJLkox1O4A!6)_9^Pje2EI+DmKD<Q^~(N223+s&>D5^Vz3*I#Uy;ex(BtA3s&Fh
z=4^OS8OlSASBxb%AGNS6n2z^R{nBZC5QmqL|7;3td7wk`HR=%gm72&ss1&B4Zp8o$
z#Kou;ynvcuo%L-jpuQhdu|=6VGXpS~dOqrmOhC;u$EDDf!Wz^>e?<*=5|y%RsE!S1
znE$AZM)jYLO69AlKx(id?#2-O7&XpO48n8P>)4F?UDR1~gUZbd$*2MPpiX@*>P0VV
zf^zJMPopN-g-!7QYD>OCo$?#l1{=*ZAEu7jocaLNf*wWnn~9t$*I7Y916830egpmS
z9n_1vP%j)t1$NrD{~NUxeih~u9gOOiV|^4ush8srT!OvvIBJ~WS<0--our@@4nj2)
zU=yrBrK%D&(M#AEUqSWXit)Gu!|)`wz@Jfj?DLe#Oe@s58K`kaqsD(6_5VLP(`~~R
zR3>Ur8Tbe_@BwUqCr~T=9y9R2P$^BEZ9Xjhu^sht%*IuigU3;O9XiKc;|x@0ve4DN
z9!4P<3$QaT#_sqo@;8EW3437Qx#q9exu^^rMgDb8@IT7Th(DOaITjVj3RDKSqsHHd
zx_(!%3;NF^|FIO(=9yomF{l;4iRrit_2OmpVC2(gMZK^;_4%kw?MEHn!>DU^6t%+d
zQCo5y6>x+3<~Jl5^}OeN@~^$f<AG9Nhzek;bpdJxt5Gj(M(yDq)C8ZR2L2lL-f7gW
zxrveZZ)>Y(Og+^)6m=#hxfB%fQtMg_pk9r-4R6`!dr=d7hPoBsTd$!ex^InKU^114
z+WS$cfYzb<Rbv!>h{~*cf<hvN05Z`PQ&9mGp;BCi!?6~7V}nX_zx$#N)p%@=3$Z0`
zLS<}^t^XZ0@sFql+_m+Ph4q<pop=gbQ7UTX52ChWC~BZ_sFatW0-KE*XbGy{deq_j
zGxo(=%*9_(<Mmo(-tUL155X>2fDLv37gA6F%TRm#3hGSkz;OH!b-2DnP5e*Po?o;6
zhPoX-i_Ia<L>=mdn1+8s4}OOl?|0PMX}*L7F~1W_K?9~@2kebn`D3V#WvD$|gbBD3
z72qD*eh6c!pTs!4hZz|2todFPqB1uVHC`nuV{6cDOJO4g?cIl{z4{8%@fxZ<da21!
zUsQ(jQT->QwqSvMz7qBRW>ls=!glx{s5A15ZEyCRc|Y+v@~@6LJm`lHV=k^oKRk`v
ztMeFu&6k-JMxrK8Mm^6)WpIG4k3?nYQEZ5lunm@A60SgH`h#WUUmZ^JKog!pf4qQ7
z`4v>kZ=trtv)ue`mxAh7iCXbe?2m8a19$;bFnWb~e-x%tUx3Q&d#KD@aw)`7@PFP6
zn1sqm3bw{v)D{$B1iH5UkEo2jje&R_72t2yz!%H{B2mxdFcveg5st+s=z1yip)eDb
z()Uo`{!g(p{)U<$_C*tM7t~=IiV0YVjd2N1$12n*{}<|3g|0Nlq85;W3Sb!WA#$BD
z6oPqBfjT4$F$OoGIv&DkJZ9T(T0^VM-*BlILi-%l0+yn-bRFvb*HK@*ZP*0=iVE-;
z*8lhaMGD<`a2uOq!YXs9GO;7|9Q4IvRA#1O5^h4J^eF0D-Na1vf5`-tjk+bntX|Z_
z^KJWT49w%fCJNf~x2zvy1L|L@1AdD^cm}nytEd&<MD_DoZ36LMT|2cyakq}1DHWd5
zvRR&@>C?;Rc%SslD)V@soHENZ<Ee?$r##`QDE3aD?X6gIbmW~i%kzUn|8HCEzWnVz
zfhifD)NZ{}(rc%UD(sb2Kj;+iEJpKA_EyX)Dk}Aqm3Yc#cuOZ1&GdREmU*XnOJ__k
zDg}>PXL&s{iYh9+rL}b{yZR)S6ixpBdY5Y4iQYNhnY`-^Ueo@i*xH~~J$?QMjht#2

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 17b2bc1d..66a4ada5 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-04-24 22:12+0200\n"
+"POT-Creation-Date: 2020-04-27 21:10+0200\n"
 "PO-Revision-Date: 2020-03-06 19:28+0100\n"
 "Last-Translator: Ed Driesen <ed.driesen@telenet.be>\n"
 "Language: nl\n"
@@ -47,8 +47,8 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:115 cps/editbooks.py:410 cps/editbooks.py:419
-#: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
+#: cps/admin.py:115 cps/editbooks.py:488 cps/editbooks.py:498
+#: cps/editbooks.py:603 cps/editbooks.py:605 cps/editbooks.py:671
 #: cps/updater.py:509 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Onbekend"
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:730 cps/web.py:1165
+#: cps/admin.py:730 cps/web.py:1218
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -137,7 +137,7 @@ msgstr "Vul alle velden in!"
 msgid "Add new user"
 msgstr "Nieuwe gebruiker toevoegen"
 
-#: cps/admin.py:742 cps/web.py:1412
+#: cps/admin.py:742 cps/web.py:1465
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
@@ -172,194 +172,198 @@ msgstr "Gelieve eerst je e-mail adres configureren..."
 msgid "E-mail server settings updated"
 msgstr "E-mailserverinstellingen bijgewerkt"
 
-#: cps/admin.py:842
+#: cps/admin.py:841
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' is verwijderd"
 
-#: cps/admin.py:845
+#: cps/admin.py:844
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:881 cps/web.py:1455
+#: cps/admin.py:850
+msgid "No admin user remaining, can't remove admin role"
+msgstr ""
+
+#: cps/admin.py:886 cps/web.py:1508
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1430
+#: cps/admin.py:896 cps/admin.py:911 cps/admin.py:931 cps/web.py:1483
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:897 cps/web.py:1422
+#: cps/admin.py:902 cps/web.py:1475
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is reeds ingenomen door iemand"
 
-#: cps/admin.py:913
+#: cps/admin.py:918
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:916
+#: cps/admin.py:921
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:939
+#: cps/admin.py:944
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:942 cps/web.py:1190 cps/web.py:1254
+#: cps/admin.py:947 cps/web.py:1243 cps/web.py:1307
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:945 cps/web.py:1131
+#: cps/admin.py:950 cps/web.py:1184
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:957
+#: cps/admin.py:962
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:996
+#: cps/admin.py:1001
 msgid "Requesting update package"
 msgstr "Bezig met opvragen van updatepakket"
 
-#: cps/admin.py:997
+#: cps/admin.py:1002
 msgid "Downloading update package"
 msgstr "Bezig met downloaden van updatepakket"
 
-#: cps/admin.py:998
+#: cps/admin.py:1003
 msgid "Unzipping update package"
 msgstr "Bezig met uitpakken van updatepakket"
 
-#: cps/admin.py:999
+#: cps/admin.py:1004
 msgid "Replacing files"
 msgstr "Bezig met bestandsvervanging"
 
-#: cps/admin.py:1000
+#: cps/admin.py:1005
 msgid "Database connections are closed"
 msgstr "Databankverbindingen zijn gesloten"
 
-#: cps/admin.py:1001
+#: cps/admin.py:1006
 msgid "Stopping server"
 msgstr "Bezig met stoppen van server"
 
-#: cps/admin.py:1002
+#: cps/admin.py:1007
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid; klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
-#: cps/admin.py:1007
+#: cps/admin.py:1008 cps/admin.py:1009 cps/admin.py:1010 cps/admin.py:1011
+#: cps/admin.py:1012
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1008 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1009 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1010 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1011 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1007
+#: cps/admin.py:1012
 msgid "Update File Could Not be Saved in Temp Dir"
-msgstr ""
+msgstr "Geüpload bestand kon niet opgeslagen worden in tijdelijke map"
 
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "niet geconfigureerd"
 
-#: cps/editbooks.py:214 cps/editbooks.py:396
+#: cps/editbooks.py:237 cps/editbooks.py:473
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Kan e-boek niet openen: het bestand bestaat niet of is ontoegankelijk"
 
-#: cps/editbooks.py:242
+#: cps/editbooks.py:265
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:321 cps/editbooks.py:569
+#: cps/editbooks.py:301
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr "%(langname)s is geen geldige taal"
+
+#: cps/editbooks.py:397 cps/editbooks.py:646
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "De bestandsextensie '%(ext)s' is niet toegestaan op deze server"
 
-#: cps/editbooks.py:325 cps/editbooks.py:573
+#: cps/editbooks.py:401 cps/editbooks.py:650
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:337 cps/editbooks.py:607
+#: cps/editbooks.py:413 cps/editbooks.py:684
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan het pad '%(path)s' niet creëren (niet gemachtigd)."
 
-#: cps/editbooks.py:342
+#: cps/editbooks.py:418
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:359
+#: cps/editbooks.py:435
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:451
+#: cps/editbooks.py:531
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover is geen jpg bestand, opslaan niet mogelijk"
 
-#: cps/editbooks.py:494
-#, python-format
-msgid "%(langname)s is not a valid language"
-msgstr "%(langname)s is geen geldige taal"
-
-#: cps/editbooks.py:525
+#: cps/editbooks.py:589
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:534
+#: cps/editbooks.py:598
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken; controleer het logbestand"
 
-#: cps/editbooks.py:581
+#: cps/editbooks.py:658
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
-msgstr "Bestand %(filename)s kon niet in de tijdelijke map opgeslaan worden"
+msgstr "Bestand %(filename)s kon niet in de tijdelijke map opgeslagen worden"
 
-#: cps/editbooks.py:598
+#: cps/editbooks.py:675
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Geüpload boek bestaat waarschijnlijk in de bibliotheek, overweeg wijzigingen alvorens opnieuw te proberen: "
 
-#: cps/editbooks.py:613
+#: cps/editbooks.py:690
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Kan %(file)s niet opslaan (niet gemachtigd)."
 
-#: cps/editbooks.py:619
+#: cps/editbooks.py:696
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Kan %(file)s niet verwijderen (niet gemachtigd)."
 
-#: cps/editbooks.py:709
+#: cps/editbooks.py:787
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:738
+#: cps/editbooks.py:816
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:824
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Het boek is in de wachtrij geplaatst voor conversie naar %(book_format)s"
 
-#: cps/editbooks.py:750
+#: cps/editbooks.py:828
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Er is een fout opgetreden bij het converteren van dit boek: %(res)s"
@@ -382,12 +386,12 @@ msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s niet aangetroffen op Google Drive: %(fn)s"
 
-#: cps/helper.py:99 cps/helper.py:211 cps/templates/detail.html:41
+#: cps/helper.py:99 cps/helper.py:226 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Versturen naar Kindle"
 
-#: cps/helper.py:100 cps/helper.py:118 cps/helper.py:213
+#: cps/helper.py:100 cps/helper.py:118 cps/helper.py:228
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Deze e-mail is verstuurd via Calibre-Web."
 
@@ -413,104 +417,104 @@ msgstr "Aan de slag met Calibre-Web"
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:151 cps/helper.py:153 cps/helper.py:161
-#: cps/helper.py:163 cps/helper.py:165
+#: cps/helper.py:151 cps/helper.py:155 cps/helper.py:159 cps/helper.py:167
+#: cps/helper.py:171 cps/helper.py:175
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:169 cps/helper.py:173
+#: cps/helper.py:180 cps/helper.py:187
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle"
 
-#: cps/helper.py:213
+#: cps/helper.py:228
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:215
+#: cps/helper.py:230
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden uitgelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:322
+#: cps/helper.py:337
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de naam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:332
+#: cps/helper.py:347
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de auteursnaam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:346
+#: cps/helper.py:361
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de naam van het bestand in '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:372 cps/helper.py:382 cps/helper.py:390
+#: cps/helper.py:387 cps/helper.py:397 cps/helper.py:405
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:411
+#: cps/helper.py:426
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boekpad '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:511
+#: cps/helper.py:530
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:516
+#: cps/helper.py:535
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/helper.py:519
+#: cps/helper.py:538
 msgid "Failed to store cover-file"
 msgstr ""
 
-#: cps/helper.py:530
+#: cps/helper.py:549
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:544
+#: cps/helper.py:563
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:658
+#: cps/helper.py:674
 msgid "Waiting"
 msgstr "Aan het wachten"
 
-#: cps/helper.py:660
+#: cps/helper.py:676
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:662
+#: cps/helper.py:678
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:664
+#: cps/helper.py:680
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:666
+#: cps/helper.py:682
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/helper.py:671
+#: cps/helper.py:687
 msgid "E-mail: "
 msgstr "E-mailadres: "
 
-#: cps/helper.py:673 cps/helper.py:677
+#: cps/helper.py:689 cps/helper.py:693
 msgid "Convert: "
 msgstr "Converteren: "
 
-#: cps/helper.py:675
+#: cps/helper.py:691
 msgid "Upload: "
 msgstr "Uploaden: "
 
-#: cps/helper.py:679
+#: cps/helper.py:695
 msgid "Unknown Task: "
 msgstr "Onbekende taak: "
 
@@ -543,7 +547,7 @@ msgstr "Aanmelden bij Google mislukt."
 msgid "Failed to fetch user info from Google."
 msgstr "Opvragen gebruikersinfo bij Google mislukt."
 
-#: cps/oauth_bb.py:225 cps/web.py:1226 cps/web.py:1371
+#: cps/oauth_bb.py:225 cps/web.py:1279 cps/web.py:1424
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -580,101 +584,93 @@ msgstr "GitHub Oauth fout, probeer het later nog eens."
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth fout, probeer het later nog eens."
 
-#: cps/shelf.py:47 cps/shelf.py:99
+#: cps/shelf.py:67 cps/shelf.py:112
 msgid "Invalid shelf specified"
 msgstr "Ongeldige boekenplank opgegeven"
 
-#: cps/shelf.py:54
+#: cps/shelf.py:73
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Sorry, je mag geen boeken toevoegen aan boekenplank: %(shelfname)s"
 
-#: cps/shelf.py:62
-msgid "You are not allowed to edit public shelves"
-msgstr "Je mag openbare boekenplanken niet bewerken"
-
-#: cps/shelf.py:71
+#: cps/shelf.py:83
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Dit boek maakt al deel uit van boekenplank: %(shelfname)s"
 
-#: cps/shelf.py:85
+#: cps/shelf.py:98
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Het boek is toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/shelf.py:104
+#: cps/shelf.py:116
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Je mag geen boeken plaatsen op boekenplank: '%(name)s"
 
-#: cps/shelf.py:109
-msgid "User is not allowed to edit public shelves"
-msgstr "Gebruiker is niet toegestaan om openbare boekenplanken aan te passen"
-
-#: cps/shelf.py:127
+#: cps/shelf.py:134
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Deze boeken maken al deel uit van boekenplank: %(name)s"
 
-#: cps/shelf.py:141
+#: cps/shelf.py:149
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "De boeken zijn toegevoegd aan boekenplank %(sname)s"
 
-#: cps/shelf.py:143
+#: cps/shelf.py:151
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Kan boeken niet toevoegen aan boekenplank: %(sname)s"
 
-#: cps/shelf.py:181
+#: cps/shelf.py:189
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Het boek werd verwijderd van boekenplank: %(sname)s"
 
-#: cps/shelf.py:190
+#: cps/shelf.py:197
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Sorry, je mag geen boeken verwijderen van deze boekenplank: %(sname)s"
 
-#: cps/shelf.py:215 cps/shelf.py:252
+#: cps/shelf.py:221 cps/shelf.py:261
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Een openbare boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:222 cps/shelf.py:260
+#: cps/shelf.py:230 cps/shelf.py:271
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:228
+#: cps/shelf.py:237
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' is aangemaakt"
 
-#: cps/shelf.py:231 cps/shelf.py:272
+#: cps/shelf.py:240 cps/shelf.py:285
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:232 cps/shelf.py:234 cps/templates/layout.html:143
+#: cps/shelf.py:241 cps/shelf.py:243 cps/templates/layout.html:143
 msgid "Create a Shelf"
-msgstr "creëer een boekenplank"
+msgstr "Maak een boekenplank"
 
-#: cps/shelf.py:270
+#: cps/shelf.py:283
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:273 cps/shelf.py:275
+#: cps/shelf.py:286 cps/shelf.py:288
 msgid "Edit a shelf"
 msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:327
+#: cps/shelf.py:332
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:330
+#: cps/shelf.py:335
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -687,114 +683,122 @@ msgstr "Verborgen boek"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank '%(name)s'"
 
-#: cps/ub.py:61
+#: cps/ub.py:63
 msgid "Recently Added"
 msgstr "Recent toegevoegd"
 
-#: cps/ub.py:63
+#: cps/ub.py:65
 msgid "Show recent books"
 msgstr "Recent toegevoegde boeken tonen"
 
-#: cps/templates/index.xml:17 cps/ub.py:64
+#: cps/templates/index.xml:17 cps/ub.py:66
 msgid "Hot Books"
 msgstr "Populaire boeken"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Show Hot Books"
 msgstr "Populaire boeken tonen"
 
-#: cps/templates/index.xml:24 cps/ub.py:68 cps/web.py:580
+#: cps/templates/index.xml:24 cps/ub.py:70 cps/web.py:611
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/ub.py:70
+#: cps/ub.py:72
 msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:71
-#: cps/web.py:1080
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:73
+#: cps/web.py:1113
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
-#: cps/ub.py:73
+#: cps/ub.py:75
 msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:75
-#: cps/web.py:1084
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:77
+#: cps/web.py:1117
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
-#: cps/ub.py:77
+#: cps/ub.py:79
 msgid "Show unread"
 msgstr "Ongelezen boeken tonen"
 
-#: cps/ub.py:78
+#: cps/ub.py:80
 msgid "Discover"
 msgstr "Willekeurige boeken"
 
-#: cps/ub.py:80
+#: cps/ub.py:82
 msgid "Show random books"
 msgstr "Willekeurige boeken tonen"
 
-#: cps/templates/index.xml:75 cps/ub.py:81 cps/web.py:860
+#: cps/templates/index.xml:75 cps/ub.py:83 cps/web.py:893
 msgid "Categories"
 msgstr "Categorieën"
 
-#: cps/ub.py:83
+#: cps/ub.py:85
 msgid "Show category selection"
 msgstr "Categoriekeuze tonen"
 
-#: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:84 cps/web.py:788
+#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
+#: cps/templates/search_form.html:53 cps/ub.py:86 cps/web.py:821
 msgid "Series"
 msgstr "Boekenreeksen"
 
-#: cps/ub.py:86
+#: cps/ub.py:88
 msgid "Show series selection"
 msgstr "Boekenreeksen keuze tonen"
 
-#: cps/templates/index.xml:61 cps/ub.py:87
+#: cps/templates/index.xml:61 cps/ub.py:89
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/ub.py:89
+#: cps/ub.py:91
 msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
-#: cps/templates/index.xml:68 cps/ub.py:91 cps/web.py:772
+#: cps/templates/index.xml:68 cps/ub.py:93 cps/web.py:805
 msgid "Publishers"
 msgstr "Uitgevers"
 
-#: cps/ub.py:93
+#: cps/ub.py:95
 msgid "Show publisher selection"
 msgstr "Uitgeverskeuze tonen"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:94
-#: cps/web.py:843
+#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:96
+#: cps/web.py:876
 msgid "Languages"
 msgstr "Talen"
 
-#: cps/ub.py:97
+#: cps/ub.py:99
 msgid "Show language selection"
 msgstr "Taalkeuze tonen"
 
-#: cps/templates/index.xml:96 cps/ub.py:98
+#: cps/templates/index.xml:96 cps/ub.py:100
 msgid "Ratings"
 msgstr "Beoordelingen"
 
-#: cps/ub.py:100
+#: cps/ub.py:102
 msgid "Show ratings selection"
 msgstr "Beoordelingen tonen"
 
-#: cps/templates/index.xml:104 cps/ub.py:101
+#: cps/templates/index.xml:104 cps/ub.py:103
 msgid "File formats"
 msgstr "Bestandsformaten"
 
-#: cps/ub.py:103
+#: cps/ub.py:105
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
+#: cps/ub.py:107 cps/web.py:1138
+msgid "Archived Books"
+msgstr ""
+
+#: cps/ub.py:109
+msgid "Show archived books"
+msgstr ""
+
 #: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
 msgid "Unexpected data while reading update information"
 msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
@@ -824,223 +828,223 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Druk op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/web.py:293
+#: cps/web.py:302
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:297
+#: cps/web.py:306
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:345
+#: cps/web.py:354
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:348
+#: cps/web.py:357
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:350
+#: cps/web.py:359
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:552
+#: cps/web.py:583
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/templates/index.html:5 cps/web.py:588
+#: cps/templates/index.html:5 cps/web.py:619
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:614
+#: cps/web.py:647
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:641
+#: cps/web.py:674
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:651
+#: cps/web.py:684
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oeps! Geselecteerd boek is niet beschikbaar. Bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:665
+#: cps/web.py:698
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:677
+#: cps/web.py:710
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:688
+#: cps/web.py:721
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:699
+#: cps/web.py:732
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:711
+#: cps/web.py:744
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:723
+#: cps/web.py:756
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:740
+#: cps/web.py:773
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:802
+#: cps/web.py:835
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:815
+#: cps/web.py:848
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:874
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:907
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/layout.html:44 cps/templates/layout.html:47
-#: cps/templates/search_form.html:170 cps/web.py:896 cps/web.py:898
+#: cps/templates/search_form.html:170 cps/web.py:929 cps/web.py:931
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/web.py:948
+#: cps/web.py:981
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:955
+#: cps/web.py:988
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:969
+#: cps/web.py:1002
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:971
+#: cps/web.py:1004
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1037 cps/web.py:1051
+#: cps/web.py:1070 cps/web.py:1084
 msgid "search"
 msgstr "zoeken"
 
-#: cps/web.py:1136
+#: cps/web.py:1189
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
 
-#: cps/web.py:1140
+#: cps/web.py:1193
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:1142
+#: cps/web.py:1195
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1159
+#: cps/web.py:1212
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-Mail server is niet geconfigureerd, contacteer alstublieft je administrator!"
 
-#: cps/web.py:1160 cps/web.py:1166 cps/web.py:1191 cps/web.py:1195
-#: cps/web.py:1200 cps/web.py:1204
+#: cps/web.py:1213 cps/web.py:1219 cps/web.py:1244 cps/web.py:1248
+#: cps/web.py:1253 cps/web.py:1257
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1193
+#: cps/web.py:1246
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1196
+#: cps/web.py:1249
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Er is een bevestigingse-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1199
+#: cps/web.py:1252
 msgid "This username or e-mail address is already in use."
 msgstr "Deze gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1216
+#: cps/web.py:1269
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1233
+#: cps/web.py:1286
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1239
+#: cps/web.py:1292
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1243 cps/web.py:1267
+#: cps/web.py:1296 cps/web.py:1320
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1250
+#: cps/web.py:1303
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord werd verzonden naar je email adres"
 
-#: cps/web.py:1256
+#: cps/web.py:1309
 msgid "Please enter valid username to reset password"
 msgstr "Gelieve een geldige gebruikersnaam opgeven om je wachtwoord te resetten"
 
-#: cps/web.py:1262
+#: cps/web.py:1315
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1275 cps/web.py:1303
+#: cps/web.py:1328 cps/web.py:1356
 msgid "login"
 msgstr "inloggen"
 
-#: cps/web.py:1315 cps/web.py:1349
+#: cps/web.py:1368 cps/web.py:1402
 msgid "Token not found"
 msgstr "Toegangssleutel niet gevonden"
 
-#: cps/web.py:1324 cps/web.py:1357
+#: cps/web.py:1377 cps/web.py:1410
 msgid "Token has expired"
 msgstr "Toegangssleutel is verlopen"
 
-#: cps/web.py:1333
+#: cps/web.py:1386
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:1414 cps/web.py:1459 cps/web.py:1465
+#: cps/web.py:1467 cps/web.py:1512 cps/web.py:1518
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1461
+#: cps/web.py:1514
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1478 cps/web.py:1575
+#: cps/web.py:1531 cps/web.py:1635
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Fout tijdens het openen van eBook. Bestand bestaat niet of is niet toegankelijk:"
 
-#: cps/web.py:1490 cps/web.py:1493 cps/web.py:1496 cps/web.py:1503
-#: cps/web.py:1508
+#: cps/web.py:1543 cps/web.py:1546 cps/web.py:1549 cps/web.py:1556
+#: cps/web.py:1561
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:1519
+#: cps/web.py:1572
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Fout tijdens het openen van eBook. Bestand bestaat niet of is niet toegankelijk."
 
@@ -1101,7 +1105,7 @@ msgstr "Bewerken"
 
 #: cps/templates/admin.html:38
 msgid "Add New User"
-msgstr "Voeg Nieuwe Gebruiker toe"
+msgstr "Gebruiker toevoegen"
 
 #: cps/templates/admin.html:40 cps/templates/admin.html:41
 msgid "Import LDAP Users"
@@ -1241,7 +1245,7 @@ msgid "OK"
 msgstr "Oké"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
-#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:187 cps/templates/book_edit.html:217
 #: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
@@ -1289,7 +1293,7 @@ msgstr "Boek verwijderen"
 msgid "Delete formats:"
 msgstr "Formaten verwijderen:"
 
-#: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:16 cps/templates/book_edit.html:216
 #: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
 #: cps/templates/user_edit.html:177
 msgid "Delete"
@@ -1319,120 +1323,148 @@ msgstr "Boek converteren"
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:256
-#: cps/templates/book_edit.html:274 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:279
+#: cps/templates/book_edit.html:297 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:276 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:284
+#: cps/templates/book_edit.html:299 cps/templates/search_form.html:126
 msgid "Description"
 msgstr "Omschrijving"
 
-#: cps/templates/book_edit.html:65 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:66
+msgid "Identifiers"
+msgstr ""
+
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:308
+msgid "Identifier Type"
+msgstr ""
+
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:309
+msgid "Identifier Value"
+msgstr ""
+
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:310
+msgid "Remove"
+msgstr ""
+
+#: cps/templates/book_edit.html:76
+msgid "Add Identifier"
+msgstr ""
+
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Labels"
 
-#: cps/templates/book_edit.html:73
+#: cps/templates/book_edit.html:88
 msgid "Series ID"
 msgstr "Series ID"
 
-#: cps/templates/book_edit.html:77
+#: cps/templates/book_edit.html:92
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:81
+#: cps/templates/book_edit.html:96
 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Boekomslag-url (jpg - de omslag wordt gedownload en opgeslagen in de databank; het invoerveld is nadien leeg)"
 
-#: cps/templates/book_edit.html:85
+#: cps/templates/book_edit.html:100
 msgid "Upload Cover from Local Disk"
 msgstr "Omslag uploaden vanaf computer"
 
-#: cps/templates/book_edit.html:90
+#: cps/templates/book_edit.html:105
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: cps/templates/book_edit.html:97 cps/templates/book_edit.html:258
-#: cps/templates/book_edit.html:275 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:112 cps/templates/book_edit.html:281
+#: cps/templates/book_edit.html:298 cps/templates/detail.html:156
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Uitgever"
 
-#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/book_edit.html:116 cps/templates/detail.html:123
 #: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:111 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:126 cps/templates/search_form.html:137
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:112 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:127 cps/templates/search_form.html:138
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:158
+#: cps/templates/book_edit.html:173
 msgid "Upload Format"
 msgstr "Uploadformaat"
 
-#: cps/templates/book_edit.html:167
+#: cps/templates/book_edit.html:182
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
+#: cps/templates/book_edit.html:185 cps/templates/book_edit.html:229
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
+#: cps/templates/book_edit.html:186 cps/templates/config_edit.html:362
 #: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
 #: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
 msgid "Save"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:185
+#: cps/templates/book_edit.html:200
 msgid "Are you really sure?"
 msgstr "Weet je het zeker?"
 
-#: cps/templates/book_edit.html:188
+#: cps/templates/book_edit.html:204
 msgid "This book will be permanently erased from database"
 msgstr "Het boek wordt verwijderd uit de Calibre-database"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:205
 msgid "and hard disk"
 msgstr "en van de harde schijf"
 
 #: cps/templates/book_edit.html:209
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/book_edit.html:210
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
+#: cps/templates/book_edit.html:232
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:233
 msgid " Search keyword "
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
 msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
 
-#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:271
+#: cps/templates/book_edit.html:254 cps/templates/book_edit.html:294
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:236 cps/templates/layout.html:189
+#: cps/templates/book_edit.html:259 cps/templates/layout.html:189
 #: cps/templates/layout.html:221 cps/templates/modal_restriction.html:34
 #: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Sluiten"
 
-#: cps/templates/book_edit.html:263 cps/templates/book_edit.html:277
+#: cps/templates/book_edit.html:286 cps/templates/book_edit.html:300
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:295
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:296
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
@@ -1853,15 +1885,27 @@ msgstr "Markeren als gelezen"
 msgid "Read"
 msgstr "Gelezen"
 
-#: cps/templates/detail.html:211
+#: cps/templates/detail.html:208
+msgid "Restore from archive"
+msgstr ""
+
+#: cps/templates/detail.html:208
+msgid "Add to archive"
+msgstr ""
+
+#: cps/templates/detail.html:209
+msgid "Archived"
+msgstr ""
+
+#: cps/templates/detail.html:219
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: cps/templates/detail.html:224 cps/templates/search.html:14
+#: cps/templates/detail.html:232 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
-#: cps/templates/detail.html:264
+#: cps/templates/detail.html:274
 msgid "Edit Metadata"
 msgstr "Metagegevens bewerken"
 
@@ -1912,7 +1956,7 @@ msgstr "Volgende"
 #: cps/templates/feed.xml:79 cps/templates/layout.html:136
 #: cps/templates/layout.html:140
 msgid "(Public)"
-msgstr ""
+msgstr "(Openbaar)"
 
 #: cps/templates/generate_kobo_auth_url.html:5
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
@@ -1976,11 +2020,11 @@ msgstr "Boeken gesorteerd op reeks"
 
 #: cps/templates/index.xml:93
 msgid "Books ordered by Languages"
-msgstr "Boeken gesorteerd op Taal"
+msgstr "Boeken gesorteerd op taal"
 
 #: cps/templates/index.xml:100
 msgid "Books ordered by Rating"
-msgstr ""
+msgstr "Boeken gesorteerd op beoordeling"
 
 #: cps/templates/index.xml:108
 msgid "Books ordered by file formats"
@@ -1988,7 +2032,7 @@ msgstr "Boeken gesorteerd op bestandsformaat"
 
 #: cps/templates/index.xml:111 cps/templates/layout.html:134
 msgid "Shelves"
-msgstr ""
+msgstr "Boekenplanken"
 
 #: cps/templates/index.xml:115
 msgid "Books organized in shelves"
@@ -2103,7 +2147,7 @@ msgstr "Toon Toegangslog: "
 
 #: cps/templates/modal_restriction.html:6
 msgid "Select Allowed/Denied Tags"
-msgstr "Selecteer Toegestaan/Geweigerd tags toe"
+msgstr "Selecteer Toegestane/Geweigerde tags"
 
 #: cps/templates/modal_restriction.html:7
 msgid "Select Allowed/Denied Custom Column Values"
@@ -2111,11 +2155,11 @@ msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden"
 
 #: cps/templates/modal_restriction.html:8
 msgid "Select Allowed/Denied Tags of User"
-msgstr "Selecteer Toegestaan/Geweigerd tags van gebruikers"
+msgstr "Selecteer Toegestane/Geweigerde tags van gebruikers"
 
 #: cps/templates/modal_restriction.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "Selecteer Toegestaan/Geweigerd aangepaste kolom waarden van gebruikers"
+msgstr "Selecteer Toegestane/Geweigerde aangepaste kolom waarden van gebruikers"
 
 #: cps/templates/modal_restriction.html:15
 msgid "Enter Tag"
@@ -2163,11 +2207,11 @@ msgstr "Ware grootte"
 
 #: cps/templates/readcbr.html:97
 msgid "Rotate Right"
-msgstr "Naar rechts draaien"
+msgstr "Rechtsom draaien"
 
 #: cps/templates/readcbr.html:98
 msgid "Rotate Left"
-msgstr "Naar links draaien"
+msgstr "Linksom draaien"
 
 #: cps/templates/readcbr.html:99
 msgid "Flip Image"

From 27eb09fb191f1fb1abbc78a5f172bbb4b7021ea4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Apr 2020 20:23:39 +0200
Subject: [PATCH 30/38] Add unrar Support

---
 cps/comic.py     | 28 ++++++++++++++++++++++++----
 cps/editbooks.py |  2 +-
 cps/helper.py    |  4 ++--
 cps/uploader.py  | 13 ++++++++-----
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index 9f0a3aa2..c7acb1cb 100755
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -33,10 +33,16 @@ except ImportError as e:
     log.debug('cannot import comicapi, extracting comic metadata will not work: %s', e)
     import zipfile
     import tarfile
+    try:
+        import rarfile
+        use_rarfile = True
+    except ImportError as e:
+        log.debug('cannot import rarfile, extracting cover files from rar files will not work: %s', e)
+        use_rarfile = False
     use_comic_meta = False
 
 
-def extractCover(tmp_file_name, original_file_extension):
+def _extractCover(tmp_file_name, original_file_extension, rarExceutable):
     if use_comic_meta:
         archive = ComicArchive(tmp_file_name)
         cover_data = None
@@ -66,6 +72,20 @@ def extractCover(tmp_file_name, original_file_extension):
                     if extension == '.jpg' or extension == '.jpeg':
                         cover_data = cf.extractfile(name).read()
                         break
+        elif original_file_extension.upper() == '.CBR' and use_rarfile:
+            try:
+                rarfile.UNRAR_TOOL = rarExceutable
+                cf = rarfile.RarFile(tmp_file_name)
+                for name in cf.getnames():
+                    ext = os.path.splitext(name)
+                    if len(ext) > 1:
+                        extension = ext[1].lower()
+                        if extension == '.jpg' or extension == '.jpeg':
+                            cover_data = cf.extractfile(name).read()
+                            break
+            except Exception as e:
+                log.debug('Rarfile failed with error: %s', e)
+
     prefix = os.path.dirname(tmp_file_name)
     if cover_data:
         tmp_cover_name = prefix + '/cover' + extension
@@ -77,7 +97,7 @@ def extractCover(tmp_file_name, original_file_extension):
     return tmp_cover_name
 
 
-def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
+def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExceutable):
     if use_comic_meta:
         archive = ComicArchive(tmp_file_path)
         if archive.seemsToBeAComicArchive():
@@ -105,7 +125,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
                 extension=original_file_extension,
                 title=loadedMetadata.title or original_file_name,
                 author=" & ".join([credit["person"] for credit in loadedMetadata.credits if credit["role"] == "Writer"]) or u'Unknown',
-                cover=extractCover(tmp_file_path, original_file_extension),
+                cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
                 description=loadedMetadata.comments or "",
                 tags="",
                 series=loadedMetadata.series or "",
@@ -118,7 +138,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
             extension=original_file_extension,
             title=original_file_name,
             author=u'Unknown',
-            cover=extractCover(tmp_file_path, original_file_extension),
+            cover=_extractCover(tmp_file_path, original_file_extension, rarExceutable),
             description="",
             tags="",
             series="",
diff --git a/cps/editbooks.py b/cps/editbooks.py
index a26820d3..748fbf5b 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -652,7 +652,7 @@ def upload():
 
             # extract metadata from file
             try:
-                meta = uploader.upload(requested_file)
+                meta = uploader.upload(requested_file, config.config_rarfile_location)
             except (IOError, OSError):
                 log.error("File %s could not saved to temp dir", requested_file.filename)
                 flash(_(u"File %(filename)s could not saved to temp dir",
diff --git a/cps/helper.py b/cps/helper.py
index f8d6efd3..fa81425a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -602,7 +602,7 @@ def check_unrar(unrarLocation):
         return
 
     if not os.path.exists(unrarLocation):
-        return 'Unrar binary file not found'
+        return _('Unrar binary file not found')
 
     try:
         if sys.version_info < (3, 0):
@@ -615,7 +615,7 @@ def check_unrar(unrarLocation):
                 log.debug("unrar version %s", version)
     except OSError as err:
         log.exception(err)
-        return 'Error excecuting UnRar'
+        return _('Error excecuting UnRar')
 
 
 def json_serial(obj):
diff --git a/cps/uploader.py b/cps/uploader.py
index d84f7daf..f553006b 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -76,7 +76,7 @@ except ImportError as e:
 __author__ = 'lemmsh'
 
 
-def process(tmp_file_path, original_file_name, original_file_extension):
+def process(tmp_file_path, original_file_name, original_file_extension, rarExcecutable):
     meta = None
     try:
         if ".PDF" == original_file_extension.upper():
@@ -85,8 +85,11 @@ def process(tmp_file_path, original_file_name, original_file_extension):
             meta = epub.get_epub_info(tmp_file_path, original_file_name, original_file_extension)
         if ".FB2" == original_file_extension.upper() and use_fb2_meta is True:
             meta = fb2.get_fb2_info(tmp_file_path, original_file_extension)
-        if original_file_extension.upper() in ['.CBZ', '.CBT']:
-            meta = comic.get_comic_info(tmp_file_path, original_file_name, original_file_extension)
+        if original_file_extension.upper() in ['.CBZ', '.CBT', 'CBR']:
+            meta = comic.get_comic_info(tmp_file_path,
+                                        original_file_name,
+                                        original_file_extension,
+                                        rarExcecutable)
 
     except Exception as ex:
         log.warning('cannot parse metadata, using default: %s', ex)
@@ -194,7 +197,7 @@ def get_versions():
             'Comic_API': ComicVersion}
 
 
-def upload(uploadfile):
+def upload(uploadfile, rarExcecutable):
     tmp_dir = os.path.join(gettempdir(), 'calibre_web')
 
     if not os.path.isdir(tmp_dir):
@@ -206,5 +209,5 @@ def upload(uploadfile):
     tmp_file_path = os.path.join(tmp_dir, md5.hexdigest())
     log.debug("Temporary file: %s", tmp_file_path)
     uploadfile.save(tmp_file_path)
-    meta = process(tmp_file_path, filename_root, file_extension)
+    meta = process(tmp_file_path, filename_root, file_extension, rarExcecutable)
     return meta

From 523aab2e9e2f8eb712e57ba627f21a9c83720f98 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 29 Apr 2020 13:58:16 +0200
Subject: [PATCH 31/38] Don't use an hardcoded session key

This fixes a trivial authentication bypass,
according to https://flask.palletsprojects.com/en/1.1.x/quickstart/#sessions
---
 cps/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 15820b86..9d7f8a9b 100755
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -89,7 +89,7 @@ def create_app():
     log.info('Starting Calibre Web...')
     Principal(app)
     lm.init_app(app)
-    app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
+    app.secret_key = os.getenv('SECRET_KEY', os.urandom(32))
 
     web_server.init_app(app, config)
     db.setup_db(config)

From fb8b6310d594f0002d40a4158de476af25668f3d Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 30 Apr 2020 20:58:01 +0200
Subject: [PATCH 32/38] Fix from tests

---
 cps/__init__.py                   |   5 +-
 cps/ub.py                         |   2 +-
 test/Calibre-Web TestSummary.html | 586 ++++++++++++++++++++----------
 3 files changed, 386 insertions(+), 207 deletions(-)
 mode change 100755 => 100644 test/Calibre-Web TestSummary.html

diff --git a/cps/__init__.py b/cps/__init__.py
index 81690fdb..e3f73731 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -95,10 +95,7 @@ def create_app():
     log.info('Starting Calibre Web...')
     Principal(app)
     lm.init_app(app)
-    if os.environ.get('FLASK_DEBUG'):
-        app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
-    else:
-        app.secret_key = os.getenv('SECRET_KEY', os.urandom(32))
+    app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
 
     web_server.init_app(app, config)
     db.setup_db(config)
diff --git a/cps/ub.py b/cps/ub.py
index ed43695d..87af1e89 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -106,7 +106,7 @@ def get_sidebar_config(kwargs=None):
     sidebar.append(
         {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
          "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
-         "show_text": _('Show archived books'), "config_show": True})
+         "show_text": _('Show archived books'), "config_show": content})
     return sidebar
 
 
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
old mode 100755
new mode 100644
index 67599b8a..9ca833ea
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-25 21:22:13</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-30 19:37:08</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-25 22:12:24</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-30 20:29:32</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>42:25 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>44:26 min</p>
         </div>
       </div>
       </div>
@@ -100,13 +100,13 @@
 
     <tr class="result['header']['style']">
         <td>test_anonymous.test_anonymous</td>
-        <td class="text-center">11</td>
-        <td class="text-center">11</td>
+        <td class="text-center">12</td>
+        <td class="text-center">12</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c1', 11)">Detail</a>
+            <a onclick="showClassDetail('c1', 12)">Detail</a>
         </td>
     </tr>
 
@@ -114,7 +114,7 @@
     
         <tr id='pt1.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_check_locale_guest</div>
+                <div class='testcase'>test_guest_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -123,7 +123,7 @@
     
         <tr id='pt1.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_about</div>
+                <div class='testcase'>test_guest_change_visibility_category</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -132,7 +132,7 @@
     
         <tr id='pt1.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_category</div>
+                <div class='testcase'>test_guest_change_visibility_format</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -177,7 +177,7 @@
     
         <tr id='pt1.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_change_visibility_series</div>
+                <div class='testcase'>test_guest_change_visibility_rating</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -186,7 +186,7 @@
     
         <tr id='pt1.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_random_books_available</div>
+                <div class='testcase'>test_guest_change_visibility_series</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -195,7 +195,7 @@
     
         <tr id='pt1.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>test_guest_visibility_read</div>
+                <div class='testcase'>test_guest_random_books_available</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -203,6 +203,15 @@
     
     
         <tr id='pt1.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_guest_restricted_settings_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt1.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_guest_visibility_sidebar</div>
             </td>
@@ -841,6 +850,48 @@
     
 
 
+    <tr class="result['header']['style']">
+        <td>test_goodreads.test_goodreads</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c7', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt7.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_author_page</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_author_page_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_kobo_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr class="result['header']['style']">
         <td>test_helper.calibre_helper</td>
         <td class="text-center">13</td>
@@ -849,13 +900,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 13)">Detail</a>
+            <a onclick="showClassDetail('c8', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort</div>
             </td>
@@ -864,7 +915,7 @@
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_comma</div>
             </td>
@@ -873,7 +924,7 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_junior</div>
             </td>
@@ -882,7 +933,7 @@
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_oneword</div>
             </td>
@@ -891,7 +942,7 @@
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt8.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_roman</div>
             </td>
@@ -900,7 +951,7 @@
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt8.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_Limit_Length</div>
             </td>
@@ -909,7 +960,7 @@
     
     
     
-        <tr id='pt7.7' class='hiddenRow bg-success'>
+        <tr id='pt8.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_char_replacement</div>
             </td>
@@ -918,7 +969,7 @@
     
     
     
-        <tr id='pt7.8' class='hiddenRow bg-success'>
+        <tr id='pt8.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_chinese_Characters</div>
             </td>
@@ -927,7 +978,7 @@
     
     
     
-        <tr id='pt7.9' class='hiddenRow bg-success'>
+        <tr id='pt8.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_degEUR_replacement</div>
             </td>
@@ -936,7 +987,7 @@
     
     
     
-        <tr id='pt7.10' class='hiddenRow bg-success'>
+        <tr id='pt8.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_doubleS</div>
             </td>
@@ -945,7 +996,7 @@
     
     
     
-        <tr id='pt7.11' class='hiddenRow bg-success'>
+        <tr id='pt8.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_finish_Dot</div>
             </td>
@@ -954,7 +1005,7 @@
     
     
     
-        <tr id='pt7.12' class='hiddenRow bg-success'>
+        <tr id='pt8.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_high23</div>
             </td>
@@ -963,7 +1014,7 @@
     
     
     
-        <tr id='pt7.13' class='hiddenRow bg-success'>
+        <tr id='pt8.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_umlauts</div>
             </td>
@@ -981,13 +1032,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 8)">Detail</a>
+            <a onclick="showClassDetail('c9', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_kobo_about</div>
             </td>
@@ -996,7 +1047,7 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelves_add_remove_books</div>
             </td>
@@ -1005,7 +1056,7 @@
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_changed_book</div>
             </td>
@@ -1014,7 +1065,7 @@
     
     
     
-        <tr id='pt8.4' class='hiddenRow bg-success'>
+        <tr id='pt9.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_invalid</div>
             </td>
@@ -1023,7 +1074,7 @@
     
     
     
-        <tr id='pt8.5' class='hiddenRow bg-success'>
+        <tr id='pt9.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_reading_state</div>
             </td>
@@ -1032,7 +1083,7 @@
     
     
     
-        <tr id='pt8.6' class='hiddenRow bg-success'>
+        <tr id='pt9.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_shelf</div>
             </td>
@@ -1041,7 +1092,7 @@
     
     
     
-        <tr id='pt8.7' class='hiddenRow bg-success'>
+        <tr id='pt9.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_unchanged</div>
             </td>
@@ -1050,7 +1101,7 @@
     
     
     
-        <tr id='pt8.8' class='hiddenRow bg-success'>
+        <tr id='pt9.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_upload</div>
             </td>
@@ -1063,18 +1114,18 @@
     <tr class="result['header']['style']">
         <td>test_ldap.test_ldap_login</td>
         <td class="text-center">9</td>
-        <td class="text-center">9</td>
-        <td class="text-center">0</td>
+        <td class="text-center">7</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 9)">Detail</a>
+            <a onclick="showClassDetail('c10', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_SSL</div>
             </td>
@@ -1083,7 +1134,7 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_STARTTLS</div>
             </td>
@@ -1092,7 +1143,7 @@
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_fallback_Login</div>
             </td>
@@ -1101,16 +1152,36 @@
     
     
     
-        <tr id='pt9.4' class='hiddenRow bg-success'>
+        <tr id='ft10.4' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_LDAP_import</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_ft10.4' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_ft10.4').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_ldap.py", line 314, in test_LDAP_import
+    self.assertEqual(rights['show_1024'], 1)
+AssertionError: None != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt9.5' class='hiddenRow bg-success'>
+        <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_login</div>
             </td>
@@ -1119,7 +1190,7 @@
     
     
     
-        <tr id='pt9.6' class='hiddenRow bg-success'>
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_invalid_LDAP</div>
             </td>
@@ -1128,7 +1199,7 @@
     
     
     
-        <tr id='pt9.7' class='hiddenRow bg-success'>
+        <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ldap_about</div>
             </td>
@@ -1137,7 +1208,7 @@
     
     
     
-        <tr id='pt9.8' class='hiddenRow bg-success'>
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ldap_authentication</div>
             </td>
@@ -1146,11 +1217,31 @@
     
     
     
-        <tr id='pt9.9' class='hiddenRow bg-success'>
+        <tr id='ft10.9' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_ft10.9' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_ft10.9').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_ldap.py", line 671, in test_ldap_opds_download_book
+    self.assertTrue(self.check_element_on_page((By.ID, "flash_success")))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1164,13 +1255,13 @@
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 6)">Detail</a>
+            <a onclick="showClassDetail('c11', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_debug_log</div>
             </td>
@@ -1179,7 +1270,7 @@
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_failed_login</div>
             </td>
@@ -1188,19 +1279,19 @@
     
     
     
-        <tr id='st10.3' class='none bg-warning'>
+        <tr id='st11.3' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.3')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.3')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st10.3' class="popup_window test_output" style="display:none;">
+                <div id='div_st11.3' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st10.3').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.3').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1214,7 +1305,7 @@
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_logfile_change</div>
             </td>
@@ -1223,19 +1314,19 @@
     
     
     
-        <tr id='ft10.5' class='none bg-danger'>
+        <tr id='ft11.5' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_logfile_recover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_ft10.5' class="popup_window test_output" style="display:none;">
+                <div id='div_ft11.5' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft10.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft11.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1252,7 +1343,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_logviewer</div>
             </td>
@@ -1270,13 +1361,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 8)">Detail</a>
+            <a onclick="showClassDetail('c12', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_digest_login</div>
             </td>
@@ -1285,7 +1376,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_capital_letters_user_unicode_password_passwort</div>
             </td>
@@ -1294,7 +1385,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_delete_admin</div>
             </td>
@@ -1303,7 +1394,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_empty_password</div>
             </td>
@@ -1312,7 +1403,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_locale_select</div>
             </td>
@@ -1321,7 +1412,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_protected</div>
             </td>
@@ -1330,7 +1421,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_unicode_user_space_end_passwort</div>
             </td>
@@ -1339,7 +1430,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_user_with_space_passwort_end_space</div>
             </td>
@@ -1357,13 +1448,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 2)">Detail</a>
+            <a onclick="showClassDetail('c13', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_oauth_about</div>
             </td>
@@ -1372,7 +1463,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_visible_oauth</div>
             </td>
@@ -1385,18 +1476,18 @@ AssertionError: False is not true : logfile config value is not empty after rese
     <tr class="result['header']['style']">
         <td>test_opds_feed.test_opds_feed</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
-        <td class="text-center">1</td>
+        <td class="text-center">20</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 20)">Detail</a>
+            <a onclick="showClassDetail('c14', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds</div>
             </td>
@@ -1405,7 +1496,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_author</div>
             </td>
@@ -1414,7 +1505,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_calibre_companion</div>
             </td>
@@ -1423,7 +1514,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_cover</div>
             </td>
@@ -1432,7 +1523,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_download_book</div>
             </td>
@@ -1441,7 +1532,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_formats</div>
             </td>
@@ -1450,7 +1541,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_guest_user</div>
             </td>
@@ -1459,7 +1550,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_hot</div>
             </td>
@@ -1468,7 +1559,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_language</div>
             </td>
@@ -1477,7 +1568,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_non_admin</div>
             </td>
@@ -1486,7 +1577,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_publisher</div>
             </td>
@@ -1495,7 +1586,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_random</div>
             </td>
@@ -1504,7 +1595,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_ratings</div>
             </td>
@@ -1513,7 +1604,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_read_unread</div>
             </td>
@@ -1522,7 +1613,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_search</div>
             </td>
@@ -1531,7 +1622,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_series</div>
             </td>
@@ -1540,36 +1631,16 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='ft13.17' class='none bg-danger'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_shelf_access</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft13.17' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft13.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_opds_feed.py", line 511, in test_opds_shelf_access
-    self.assertEqual(200, r.status_code)
-AssertionError: 200 != 500</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_tags</div>
             </td>
@@ -1578,7 +1649,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt13.19' class='hiddenRow bg-success'>
+        <tr id='pt14.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_top_rated</div>
             </td>
@@ -1587,7 +1658,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt13.20' class='hiddenRow bg-success'>
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_recently_added</div>
             </td>
@@ -1605,13 +1676,13 @@ AssertionError: 200 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 6)">Detail</a>
+            <a onclick="showClassDetail('c15', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_forgot_password</div>
             </td>
@@ -1620,7 +1691,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_domain</div>
             </td>
@@ -1629,7 +1700,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_register_no_server</div>
             </td>
@@ -1638,7 +1709,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user</div>
             </td>
@@ -1647,7 +1718,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user_fail</div>
             </td>
@@ -1656,7 +1727,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_change_password</div>
             </td>
@@ -1668,19 +1739,19 @@ AssertionError: 200 != 500</pre>
 
     <tr class="result['header']['style']">
         <td>test_shelf.test_shelf</td>
+        <td class="text-center">9</td>
         <td class="text-center">8</td>
-        <td class="text-center">7</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 8)">Detail</a>
+            <a onclick="showClassDetail('c16', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_arrange_shelf</div>
             </td>
@@ -1689,7 +1760,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_delete_book_of_shelf</div>
             </td>
@@ -1698,7 +1769,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_private_shelf</div>
             </td>
@@ -1707,7 +1778,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_private_shelf</div>
             </td>
@@ -1716,7 +1787,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_shelf</div>
             </td>
@@ -1725,7 +1796,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_rename_shelf</div>
             </td>
@@ -1734,19 +1805,28 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='st15.7' class='none bg-warning'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_shelf_action_non_shelf_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='st16.8' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st15.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.8')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st15.7' class="popup_window test_output" style="display:none;">
+                <div id='div_st16.8' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st15.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st16.8').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1760,7 +1840,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelf_long_name</div>
             </td>
@@ -1778,13 +1858,13 @@ AssertionError: 200 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_errors</div>
             </td>
@@ -1793,7 +1873,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_request_errors</div>
             </td>
@@ -1802,7 +1882,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_errors</div>
             </td>
@@ -1811,7 +1891,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_versions</div>
             </td>
@@ -1820,7 +1900,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update</div>
             </td>
@@ -1829,7 +1909,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update_stable_errors</div>
             </td>
@@ -1838,19 +1918,19 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='st16.7' class='none bg-warning'>
+        <tr id='st17.7' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st17.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st16.7' class="popup_window test_output" style="display:none;">
+                <div id='div_st17.7' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st16.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st17.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1867,19 +1947,19 @@ AssertionError: 200 != 500</pre>
 
     <tr class="result['header']['style']">
         <td>test_user_template.test_user_template</td>
-        <td class="text-center">17</td>
+        <td class="text-center">19</td>
         <td class="text-center">17</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 17)">Detail</a>
+            <a onclick="showClassDetail('c18', 19)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_column_restriction</div>
             </td>
@@ -1888,7 +1968,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tag_restriction</div>
             </td>
@@ -1897,7 +1977,46 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='et18.3' class='none bg-info'>
+            <td>
+                <div class='testcase'>test_archived_format_template</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_et18.3' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_et18.3').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_user_template.py", line 293, in test_archived_format_template
+    self.fill_view_config({'show_32768':0})
+  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 377, in fill_view_config
+    ele.clear()
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webelement.py", line 95, in clear
+    self._execute(Command.CLEAR_ELEMENT)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webelement.py", line 633, in _execute
+    return self._parent.execute(command, params)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 321, in execute
+    self.error_handler.check_response(response)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/errorhandler.py", line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.InvalidElementStateException: Message: Unable to clear element that cannot be edited: <input id="show_32768" name="show_32768" type="checkbox"></pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_user_template</div>
             </td>
@@ -1906,7 +2025,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_best_user_template</div>
             </td>
@@ -1915,7 +2034,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_category_user_template</div>
             </td>
@@ -1924,7 +2043,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_column_restriction</div>
             </td>
@@ -1933,7 +2052,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_tag_restriction</div>
             </td>
@@ -1942,7 +2061,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_detail_random_user_template</div>
             </td>
@@ -1951,7 +2070,16 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt18.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_format_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_hot_user_template</div>
             </td>
@@ -1960,7 +2088,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt18.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_language_user_template</div>
             </td>
@@ -1969,7 +2097,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt18.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_book_languages</div>
             </td>
@@ -1978,7 +2106,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt18.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_publisher_user_template</div>
             </td>
@@ -1987,7 +2115,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt18.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_user_template</div>
             </td>
@@ -1996,7 +2124,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt18.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_read_user_template</div>
             </td>
@@ -2005,16 +2133,46 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='et18.17' class='none bg-info'>
             <td>
                 <div class='testcase'>test_recent_user_template</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id='div_et18.17' class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick="document.getElementById('div_et18.17').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_user_template.py", line 77, in test_recent_user_template
+    'show_16384': 0, 'show_32678': 0, 'show_2':0
+  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 376, in fill_view_config
+    ele = cls.driver.find_element_by_id(key)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 978, in find_element
+    'value': value})['value']
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 321, in execute
+    self.error_handler.check_response(response)
+  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/errorhandler.py", line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id="show_1024"]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt18.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_series_user_template</div>
             </td>
@@ -2023,7 +2181,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt18.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ui_language_settings</div>
             </td>
@@ -2035,19 +2193,19 @@ AssertionError: 200 != 500</pre>
 
     <tr class="result['header']['style']">
         <td>test_visiblilitys.calibre_web_visibilitys</td>
-        <td class="text-center">23</td>
-        <td class="text-center">23</td>
+        <td class="text-center">25</td>
+        <td class="text-center">25</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 23)">Detail</a>
+            <a onclick="showClassDetail('c19', 25)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_about</div>
             </td>
@@ -2056,7 +2214,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_SMTP_Settings</div>
             </td>
@@ -2065,7 +2223,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_add_user</div>
             </td>
@@ -2074,7 +2232,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_password</div>
             </td>
@@ -2083,7 +2241,16 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_admin_change_visibility_archived</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_authors</div>
             </td>
@@ -2092,7 +2259,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_category</div>
             </td>
@@ -2101,7 +2268,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt19.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_file_formats</div>
             </td>
@@ -2110,7 +2277,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.8' class='hiddenRow bg-success'>
+        <tr id='pt19.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_hot</div>
             </td>
@@ -2119,7 +2286,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.9' class='hiddenRow bg-success'>
+        <tr id='pt19.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_language</div>
             </td>
@@ -2128,7 +2295,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.10' class='hiddenRow bg-success'>
+        <tr id='pt19.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_publisher</div>
             </td>
@@ -2137,7 +2304,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.11' class='hiddenRow bg-success'>
+        <tr id='pt19.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rated</div>
             </td>
@@ -2146,7 +2313,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.12' class='hiddenRow bg-success'>
+        <tr id='pt19.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rating</div>
             </td>
@@ -2155,7 +2322,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.13' class='hiddenRow bg-success'>
+        <tr id='pt19.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_read</div>
             </td>
@@ -2164,7 +2331,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.14' class='hiddenRow bg-success'>
+        <tr id='pt19.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_series</div>
             </td>
@@ -2173,7 +2340,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.15' class='hiddenRow bg-success'>
+        <tr id='pt19.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_columns</div>
             </td>
@@ -2182,7 +2349,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.16' class='hiddenRow bg-success'>
+        <tr id='pt19.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tags</div>
             </td>
@@ -2191,7 +2358,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.17' class='hiddenRow bg-success'>
+        <tr id='pt19.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_checked_logged_in</div>
             </td>
@@ -2200,7 +2367,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.18' class='hiddenRow bg-success'>
+        <tr id='pt19.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_books_available</div>
             </td>
@@ -2209,7 +2376,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.19' class='hiddenRow bg-success'>
+        <tr id='pt19.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_columns</div>
             </td>
@@ -2218,7 +2385,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.20' class='hiddenRow bg-success'>
+        <tr id='pt19.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_tags</div>
             </td>
@@ -2227,7 +2394,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.21' class='hiddenRow bg-success'>
+        <tr id='pt19.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_search_functions</div>
             </td>
@@ -2236,7 +2403,16 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.22' class='hiddenRow bg-success'>
+        <tr id='pt19.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_email_available</div>
             </td>
@@ -2245,7 +2421,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt18.23' class='hiddenRow bg-success'>
+        <tr id='pt19.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_visibility_sidebar</div>
             </td>
@@ -2256,10 +2432,10 @@ AssertionError: 200 != 500</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>192</td>
-        <td>183</td>
+        <td>201</td>
+        <td>189</td>
+        <td>3</td>
         <td>2</td>
-        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -2354,7 +2530,7 @@ AssertionError: 200 != 500</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2019.3</td>
+              <td>2020.1</td>
               <td>Basic</td>
             </tr>
           
@@ -2418,6 +2594,12 @@ AssertionError: 200 != 500</pre>
               <td>test_edit_books</td>
             </tr>
           
+            <tr>
+              <th>goodreads</th>
+              <td>0.3.2</td>
+              <td>test_goodreads</td>
+            </tr>
+          
             <tr>
               <th>jsonschema</th>
               <td>3.2.0</td>
@@ -2444,7 +2626,7 @@ AssertionError: 200 != 500</pre>
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.36.3</td>
+              <td>0.36.4</td>
               <td>test_OAuth_login</td>
             </tr>
           
@@ -2456,7 +2638,7 @@ AssertionError: 200 != 500</pre>
 </div>
 
 <script>
-    drawCircle(183, 2, 0, 7);
+    drawCircle(189, 3, 2, 7);
 </script>
 
 </div>

From d6f41d8dc027cd6c4aca8498555dfa81e97dad9a Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 08:33:50 +0200
Subject: [PATCH 33/38] Fix error 404 on reset password (Fix #1342)

---
 cps/admin.py                 | 4 ++--
 cps/templates/book_edit.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 2bfca96b..3e703f21 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -933,8 +933,8 @@ def edit_user(user_id):
 @login_required
 @admin_required
 def reset_user_password(user_id):
-    if not config.config_public_reg:
-        abort(404)
+    #if not config.config_public_reg:
+    #    abort(404)
     if current_user is not None and current_user.is_authenticated:
         ret, message = reset_password(user_id)
         if ret == 1:
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index f931a60a..b72ef197 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -184,7 +184,7 @@
     </div>
     <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Fetch Metadata')}}</a>
     <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
-    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
+    <a href="{{ url_for('web.show_book', book_id=book.id) }}" id="edit_cancel" class="btn btn-default">{{_('Cancel')}}</a>
   </div>
 </form>
 

From bb317d54f258828fa75ae189f3af544f2c758ef5 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 08:37:54 +0200
Subject: [PATCH 34/38] Fix reject reset password without configured email
 server

---
 cps/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 3e703f21..43c15836 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -933,8 +933,8 @@ def edit_user(user_id):
 @login_required
 @admin_required
 def reset_user_password(user_id):
-    #if not config.config_public_reg:
-    #    abort(404)
+    if not config.get_mail_server_configured():
+        abort(404)
     if current_user is not None and current_user.is_authenticated:
         ret, message = reset_password(user_id)
         if ret == 1:

From 000b85ff812b8778ec574e58b15f75a69c283db2 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 10:26:35 +0200
Subject: [PATCH 35/38] Fixes for deleting books(error handling and user
 feedback)

---
 cps/admin.py     |  2 --
 cps/editbooks.py |  7 ++++++-
 cps/helper.py    | 29 ++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 43c15836..795bccb8 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -933,8 +933,6 @@ def edit_user(user_id):
 @login_required
 @admin_required
 def reset_user_password(user_id):
-    if not config.get_mail_server_configured():
-        abort(404)
     if current_user is not None and current_user.is_authenticated:
         ret, message = reset_password(user_id)
         if ret == 1:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 6ba252a7..d66763bf 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -177,7 +177,10 @@ def delete_book(book_id, book_format):
         book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
         if book:
             try:
-                helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
+                result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
+                if not result:
+                    flash(error, category="error")
+                    return redirect(url_for('editbook.edit_book', book_id=book_id))
                 if not book_format:
                     # delete book from Shelfs, Downloads, Read list
                     ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
@@ -233,8 +236,10 @@ def delete_book(book_id, book_format):
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
     if book_format:
+        flash(_('Book Format Successfully Deleted'), category="success")
         return redirect(url_for('editbook.edit_book', book_id=book_id))
     else:
+        flash(_('Book Successfully Deleted'), category="success")
         return redirect(url_for('web.index'))
 
 
diff --git a/cps/helper.py b/cps/helper.py
index c648fa48..4eebba55 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -296,15 +296,29 @@ def delete_book_file(book, calibrepath, book_format=None):
             if os.path.isdir(path):
                 if len(next(os.walk(path))[1]):
                     log.error("Deleting book %s failed, path has subfolders: %s", book.id, book.path)
-                    return False
-                shutil.rmtree(path, ignore_errors=True)
+                    return False , _("Deleting book %(id)s failed, path has subfolders: %(path)s",
+                                     id=book.id,
+                                     path=book.path)
+                try:
+                    for root, __, files in os.walk(path):
+                        for f in files:
+                            os.unlink(os.path.join(root, f))
+                    shutil.rmtree(path)
+                except (IOError, OSError) as e:
+                    log.error("Deleting book %s failed: %s", book.id, e)
+                    return False, _("Deleting book %(id)s failed: %(message)s", id=book.id, message=e)
                 authorpath = os.path.join(calibrepath, os.path.split(book.path)[0])
                 if not os.listdir(authorpath):
-                    shutil.rmtree(authorpath, ignore_errors=True)
-                return True
+                    try:
+                        shutil.rmtree(authorpath)
+                    except (IOError, OSError) as e:
+                        log.error("Deleting authorpath for book %s failed: %s", book.id, e)
+                return True, None
             else:
                 log.error("Deleting book %s failed, book path not valid: %s", book.id, book.path)
-                return False
+                return False, _("Deleting book %(id)s failed, book path not valid: %(path)s",
+                                     id=book.id,
+                                     path=book.path)
 
 
 def update_dir_structure_file(book_id, calibrepath, first_author):
@@ -413,7 +427,7 @@ def update_dir_structure_gdrive(book_id, first_author):
 
 
 def delete_book_gdrive(book, book_format):
-    error = False
+    error = None
     if book_format:
         name = ''
         for entry in book.data:
@@ -427,7 +441,8 @@ def delete_book_gdrive(book, book_format):
         gFile.Trash()
     else:
         error = _(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
-    return error
+
+    return error is None, error
 
 
 def reset_password(user_id):

From 832b34fc54f3a30a7250a8ab94e157d82c16b7e7 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 12:00:45 +0200
Subject: [PATCH 36/38] Improved errorhandling for resending password Improved
 errorhandling for editing user

---
 cps/admin.py  | 3 +++
 cps/helper.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/cps/admin.py b/cps/admin.py
index 795bccb8..5cec8e26 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -817,6 +817,9 @@ def update_mailsettings():
 @admin_required
 def edit_user(user_id):
     content = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()  # type: ub.User
+    if not content:
+        flash(_(u"User not found"), category="error")
+        return redirect(url_for('admin.admin'))
     downloads = list()
     languages = speaking_language()
     translations = babel.list_translations() + [LC('en')]
diff --git a/cps/helper.py b/cps/helper.py
index 4eebba55..435b1322 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -447,6 +447,8 @@ def delete_book_gdrive(book, book_format):
 
 def reset_password(user_id):
     existing_user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
+    if not existing_user:
+        return 0, None
     password = generate_random_password()
     existing_user.password = generate_password_hash(password)
     if not config.get_mail_server_configured():

From 2c5d76908a10008bea0df56a4c399d39f3c6d65f Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 13:34:16 +0200
Subject: [PATCH 37/38] Added missing upload format

---
 cps/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/constants.py b/cps/constants.py
index 6c549a25..586172f7 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -113,7 +113,7 @@ del env_CALIBRE_PORT
 EXTENSIONS_AUDIO    = {'mp3', 'm4a', 'm4b'}
 EXTENSIONS_CONVERT  = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt'}
 EXTENSIONS_UPLOAD   = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
-                       'fb2', 'html', 'rtf', 'odt', 'mp3',  'm4a', 'm4b'}
+                       'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3',  'm4a', 'm4b'}
 # EXTENSIONS_READER = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt'] +
 #                         (['rar','cbr'] if feature_support['rar'] else []))
 

From 99cc69c67db32e3ff5c8b8b8f06508742e92beff Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 1 May 2020 14:38:54 +0200
Subject: [PATCH 38/38] Update Teststatus

---
 test/Calibre-Web TestSummary.html | 634 ++++++++++++++----------------
 1 file changed, 291 insertions(+), 343 deletions(-)

diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
index 9ca833ea..ea31b506 100644
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-30 19:37:08</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-05-01 13:35:57</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-30 20:29:32</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-05-01 14:32:26</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>44:26 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>47:49 min</p>
         </div>
       </div>
       </div>
@@ -422,46 +422,53 @@
 
 
     <tr class="result['header']['style']">
-        <td>test_edit_books.test_edit_books</td>
-        <td class="text-center">31</td>
-        <td class="text-center">28</td>
+        <td>test_edit_additional_books.test_edit_additional_books</td>
+        <td class="text-center">2</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">3</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c4', 31)">Detail</a>
+            <a onclick="showClassDetail('c4', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='st4.1' class='none bg-warning'>
+        <tr id='pt4.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_delete_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st4.1')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st4.1' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st4.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Not Implemented</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt4.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_upload_book_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr class="result['header']['style']">
+        <td>test_edit_books.test_edit_books</td>
+        <td class="text-center">30</td>
+        <td class="text-center">28</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c5', 30)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_download_book</div>
             </td>
@@ -470,7 +477,7 @@
     
     
     
-        <tr id='pt4.3' class='hiddenRow bg-success'>
+        <tr id='pt5.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_author</div>
             </td>
@@ -479,7 +486,7 @@
     
     
     
-        <tr id='pt4.4' class='hiddenRow bg-success'>
+        <tr id='pt5.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_category</div>
             </td>
@@ -488,7 +495,7 @@
     
     
     
-        <tr id='pt4.5' class='hiddenRow bg-success'>
+        <tr id='pt5.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_comments</div>
             </td>
@@ -497,7 +504,7 @@
     
     
     
-        <tr id='pt4.6' class='hiddenRow bg-success'>
+        <tr id='pt5.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_custom_bool</div>
             </td>
@@ -506,7 +513,7 @@
     
     
     
-        <tr id='pt4.7' class='hiddenRow bg-success'>
+        <tr id='pt5.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_custom_rating</div>
             </td>
@@ -515,7 +522,7 @@
     
     
     
-        <tr id='pt4.8' class='hiddenRow bg-success'>
+        <tr id='pt5.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_custom_single_select</div>
             </td>
@@ -524,7 +531,7 @@
     
     
     
-        <tr id='pt4.9' class='hiddenRow bg-success'>
+        <tr id='pt5.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_custom_text</div>
             </td>
@@ -533,7 +540,7 @@
     
     
     
-        <tr id='pt4.10' class='hiddenRow bg-success'>
+        <tr id='pt5.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_language</div>
             </td>
@@ -542,7 +549,7 @@
     
     
     
-        <tr id='pt4.11' class='hiddenRow bg-success'>
+        <tr id='pt5.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_publisher</div>
             </td>
@@ -551,19 +558,19 @@
     
     
     
-        <tr id='st4.12' class='none bg-warning'>
+        <tr id='st5.11' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_edit_publishing_date</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st4.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st5.11')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st4.12' class="popup_window test_output" style="display:none;">
+                <div id='div_st5.11' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st4.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st5.11').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -577,7 +584,7 @@
     
     
     
-        <tr id='pt4.13' class='hiddenRow bg-success'>
+        <tr id='pt5.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_rating</div>
             </td>
@@ -586,7 +593,7 @@
     
     
     
-        <tr id='pt4.14' class='hiddenRow bg-success'>
+        <tr id='pt5.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_series</div>
             </td>
@@ -595,7 +602,7 @@
     
     
     
-        <tr id='pt4.15' class='hiddenRow bg-success'>
+        <tr id='pt5.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_edit_title</div>
             </td>
@@ -604,19 +611,19 @@
     
     
     
-        <tr id='st4.16' class='none bg-warning'>
+        <tr id='st5.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st4.16')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st5.15')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st4.16' class="popup_window test_output" style="display:none;">
+                <div id='div_st5.15' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st4.16').style.display='none'"><span
+                                onclick="document.getElementById('div_st5.15').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -630,7 +637,7 @@
     
     
     
-        <tr id='pt4.17' class='hiddenRow bg-success'>
+        <tr id='pt5.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_author</div>
             </td>
@@ -639,7 +646,7 @@
     
     
     
-        <tr id='pt4.18' class='hiddenRow bg-success'>
+        <tr id='pt5.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_functions</div>
             </td>
@@ -648,7 +655,7 @@
     
     
     
-        <tr id='pt4.19' class='hiddenRow bg-success'>
+        <tr id='pt5.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_language</div>
             </td>
@@ -657,7 +664,7 @@
     
     
     
-        <tr id='pt4.20' class='hiddenRow bg-success'>
+        <tr id='pt5.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_publisher</div>
             </td>
@@ -666,7 +673,7 @@
     
     
     
-        <tr id='pt4.21' class='hiddenRow bg-success'>
+        <tr id='pt5.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_series</div>
             </td>
@@ -675,7 +682,7 @@
     
     
     
-        <tr id='pt4.22' class='hiddenRow bg-success'>
+        <tr id='pt5.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_typeahead_tag</div>
             </td>
@@ -684,7 +691,7 @@
     
     
     
-        <tr id='pt4.23' class='hiddenRow bg-success'>
+        <tr id='pt5.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_cbr</div>
             </td>
@@ -693,7 +700,7 @@
     
     
     
-        <tr id='pt4.24' class='hiddenRow bg-success'>
+        <tr id='pt5.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_cbt</div>
             </td>
@@ -702,7 +709,7 @@
     
     
     
-        <tr id='pt4.25' class='hiddenRow bg-success'>
+        <tr id='pt5.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_cbz</div>
             </td>
@@ -711,7 +718,7 @@
     
     
     
-        <tr id='pt4.26' class='hiddenRow bg-success'>
+        <tr id='pt5.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_epub</div>
             </td>
@@ -720,7 +727,7 @@
     
     
     
-        <tr id='pt4.27' class='hiddenRow bg-success'>
+        <tr id='pt5.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_fb2</div>
             </td>
@@ -729,7 +736,7 @@
     
     
     
-        <tr id='pt4.28' class='hiddenRow bg-success'>
+        <tr id='pt5.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_lit</div>
             </td>
@@ -738,7 +745,7 @@
     
     
     
-        <tr id='pt4.29' class='hiddenRow bg-success'>
+        <tr id='pt5.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_mobi</div>
             </td>
@@ -747,7 +754,7 @@
     
     
     
-        <tr id='pt4.30' class='hiddenRow bg-success'>
+        <tr id='pt5.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_book_pdf</div>
             </td>
@@ -756,7 +763,7 @@
     
     
     
-        <tr id='pt4.31' class='hiddenRow bg-success'>
+        <tr id='pt5.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_upload_cover_hdd</div>
             </td>
@@ -768,19 +775,19 @@
 
     <tr class="result['header']['style']">
         <td>test_email_STARTTLS.test_STARTTLS</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c5', 2)">Detail</a>
+            <a onclick="showClassDetail('c6', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt5.1' class='hiddenRow bg-success'>
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_STARTTLS</div>
             </td>
@@ -789,7 +796,7 @@
     
     
     
-        <tr id='pt5.2' class='hiddenRow bg-success'>
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -797,6 +804,15 @@
         </tr>
     
     
+    
+        <tr id='pt6.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_STARTTLS_resend_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr class="result['header']['style']">
@@ -807,13 +823,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 4)">Detail</a>
+            <a onclick="showClassDetail('c7', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_SSL_None_setup_error</div>
             </td>
@@ -822,7 +838,7 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -831,7 +847,7 @@
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_SSL_logging_email</div>
             </td>
@@ -840,7 +856,7 @@
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_SSL_only</div>
             </td>
@@ -858,13 +874,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 3)">Detail</a>
+            <a onclick="showClassDetail('c8', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_page</div>
             </td>
@@ -873,7 +889,7 @@
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_page_invalid</div>
             </td>
@@ -882,7 +898,7 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_kobo_about</div>
             </td>
@@ -900,13 +916,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 13)">Detail</a>
+            <a onclick="showClassDetail('c9', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort</div>
             </td>
@@ -915,7 +931,7 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_comma</div>
             </td>
@@ -924,7 +940,7 @@
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_junior</div>
             </td>
@@ -933,7 +949,7 @@
     
     
     
-        <tr id='pt8.4' class='hiddenRow bg-success'>
+        <tr id='pt9.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_oneword</div>
             </td>
@@ -942,7 +958,7 @@
     
     
     
-        <tr id='pt8.5' class='hiddenRow bg-success'>
+        <tr id='pt9.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_sort_roman</div>
             </td>
@@ -951,7 +967,7 @@
     
     
     
-        <tr id='pt8.6' class='hiddenRow bg-success'>
+        <tr id='pt9.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_Limit_Length</div>
             </td>
@@ -960,7 +976,7 @@
     
     
     
-        <tr id='pt8.7' class='hiddenRow bg-success'>
+        <tr id='pt9.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_char_replacement</div>
             </td>
@@ -969,7 +985,7 @@
     
     
     
-        <tr id='pt8.8' class='hiddenRow bg-success'>
+        <tr id='pt9.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_chinese_Characters</div>
             </td>
@@ -978,7 +994,7 @@
     
     
     
-        <tr id='pt8.9' class='hiddenRow bg-success'>
+        <tr id='pt9.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_degEUR_replacement</div>
             </td>
@@ -987,7 +1003,7 @@
     
     
     
-        <tr id='pt8.10' class='hiddenRow bg-success'>
+        <tr id='pt9.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_doubleS</div>
             </td>
@@ -996,7 +1012,7 @@
     
     
     
-        <tr id='pt8.11' class='hiddenRow bg-success'>
+        <tr id='pt9.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_finish_Dot</div>
             </td>
@@ -1005,7 +1021,7 @@
     
     
     
-        <tr id='pt8.12' class='hiddenRow bg-success'>
+        <tr id='pt9.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_high23</div>
             </td>
@@ -1014,7 +1030,7 @@
     
     
     
-        <tr id='pt8.13' class='hiddenRow bg-success'>
+        <tr id='pt9.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_umlauts</div>
             </td>
@@ -1032,13 +1048,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 8)">Detail</a>
+            <a onclick="showClassDetail('c10', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_kobo_about</div>
             </td>
@@ -1047,7 +1063,7 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelves_add_remove_books</div>
             </td>
@@ -1056,7 +1072,7 @@
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_changed_book</div>
             </td>
@@ -1065,7 +1081,7 @@
     
     
     
-        <tr id='pt9.4' class='hiddenRow bg-success'>
+        <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_invalid</div>
             </td>
@@ -1074,7 +1090,7 @@
     
     
     
-        <tr id='pt9.5' class='hiddenRow bg-success'>
+        <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_reading_state</div>
             </td>
@@ -1083,7 +1099,7 @@
     
     
     
-        <tr id='pt9.6' class='hiddenRow bg-success'>
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_shelf</div>
             </td>
@@ -1092,7 +1108,7 @@
     
     
     
-        <tr id='pt9.7' class='hiddenRow bg-success'>
+        <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_unchanged</div>
             </td>
@@ -1101,7 +1117,7 @@
     
     
     
-        <tr id='pt9.8' class='hiddenRow bg-success'>
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_sync_upload</div>
             </td>
@@ -1114,18 +1130,18 @@
     <tr class="result['header']['style']">
         <td>test_ldap.test_ldap_login</td>
         <td class="text-center">9</td>
-        <td class="text-center">7</td>
-        <td class="text-center">2</td>
+        <td class="text-center">9</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 9)">Detail</a>
+            <a onclick="showClassDetail('c11', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_SSL</div>
             </td>
@@ -1134,7 +1150,7 @@
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_STARTTLS</div>
             </td>
@@ -1143,7 +1159,7 @@
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_fallback_Login</div>
             </td>
@@ -1152,36 +1168,16 @@
     
     
     
-        <tr id='ft10.4' class='none bg-danger'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_import</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft10.4' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft10.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_ldap.py", line 314, in test_LDAP_import
-    self.assertEqual(rights['show_1024'], 1)
-AssertionError: None != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_LDAP_login</div>
             </td>
@@ -1190,7 +1186,7 @@ AssertionError: None != 1</pre>
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_invalid_LDAP</div>
             </td>
@@ -1199,7 +1195,7 @@ AssertionError: None != 1</pre>
     
     
     
-        <tr id='pt10.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ldap_about</div>
             </td>
@@ -1208,7 +1204,7 @@ AssertionError: None != 1</pre>
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ldap_authentication</div>
             </td>
@@ -1217,31 +1213,11 @@ AssertionError: None != 1</pre>
     
     
     
-        <tr id='ft10.9' class='none bg-danger'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ldap_opds_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft10.9' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft10.9').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_ldap.py", line 671, in test_ldap_opds_download_book
-    self.assertTrue(self.check_element_on_page((By.ID, "flash_success")))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1255,13 +1231,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 6)">Detail</a>
+            <a onclick="showClassDetail('c12', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_debug_log</div>
             </td>
@@ -1270,7 +1246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_failed_login</div>
             </td>
@@ -1279,19 +1255,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='st11.3' class='none bg-warning'>
+        <tr id='st12.3' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.3')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.3')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st11.3' class="popup_window test_output" style="display:none;">
+                <div id='div_st12.3' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st11.3').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.3').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1305,7 +1281,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_logfile_change</div>
             </td>
@@ -1314,19 +1290,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='ft11.5' class='none bg-danger'>
+        <tr id='ft12.5' class='none bg-danger'>
             <td>
                 <div class='testcase'>test_logfile_recover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_ft11.5' class="popup_window test_output" style="display:none;">
+                <div id='div_ft12.5' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_ft11.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft12.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1343,7 +1319,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_logviewer</div>
             </td>
@@ -1361,13 +1337,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 8)">Detail</a>
+            <a onclick="showClassDetail('c13', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_digest_login</div>
             </td>
@@ -1376,7 +1352,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_capital_letters_user_unicode_password_passwort</div>
             </td>
@@ -1385,7 +1361,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_delete_admin</div>
             </td>
@@ -1394,7 +1370,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_empty_password</div>
             </td>
@@ -1403,7 +1379,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_locale_select</div>
             </td>
@@ -1412,7 +1388,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_protected</div>
             </td>
@@ -1421,7 +1397,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_unicode_user_space_end_passwort</div>
             </td>
@@ -1430,7 +1406,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_login_user_with_space_passwort_end_space</div>
             </td>
@@ -1448,13 +1424,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 2)">Detail</a>
+            <a onclick="showClassDetail('c14', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_oauth_about</div>
             </td>
@@ -1463,7 +1439,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_visible_oauth</div>
             </td>
@@ -1481,13 +1457,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 20)">Detail</a>
+            <a onclick="showClassDetail('c15', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds</div>
             </td>
@@ -1496,7 +1472,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_author</div>
             </td>
@@ -1505,7 +1481,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_calibre_companion</div>
             </td>
@@ -1514,7 +1490,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_cover</div>
             </td>
@@ -1523,7 +1499,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_download_book</div>
             </td>
@@ -1532,7 +1508,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_formats</div>
             </td>
@@ -1541,7 +1517,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_guest_user</div>
             </td>
@@ -1550,7 +1526,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_hot</div>
             </td>
@@ -1559,7 +1535,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_language</div>
             </td>
@@ -1568,7 +1544,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_non_admin</div>
             </td>
@@ -1577,7 +1553,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_publisher</div>
             </td>
@@ -1586,7 +1562,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_random</div>
             </td>
@@ -1595,7 +1571,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_ratings</div>
             </td>
@@ -1604,7 +1580,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_read_unread</div>
             </td>
@@ -1613,7 +1589,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_search</div>
             </td>
@@ -1622,7 +1598,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_series</div>
             </td>
@@ -1631,7 +1607,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_shelf_access</div>
             </td>
@@ -1640,7 +1616,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_tags</div>
             </td>
@@ -1649,7 +1625,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.19' class='hiddenRow bg-success'>
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_top_rated</div>
             </td>
@@ -1658,7 +1634,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_recently_added</div>
             </td>
@@ -1676,13 +1652,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 6)">Detail</a>
+            <a onclick="showClassDetail('c16', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_forgot_password</div>
             </td>
@@ -1691,7 +1667,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_domain</div>
             </td>
@@ -1700,7 +1676,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_register_no_server</div>
             </td>
@@ -1709,7 +1685,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user</div>
             </td>
@@ -1718,7 +1694,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user_fail</div>
             </td>
@@ -1727,7 +1703,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_change_password</div>
             </td>
@@ -1745,13 +1721,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 9)">Detail</a>
+            <a onclick="showClassDetail('c17', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_arrange_shelf</div>
             </td>
@@ -1760,7 +1736,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_delete_book_of_shelf</div>
             </td>
@@ -1769,7 +1745,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_private_shelf</div>
             </td>
@@ -1778,7 +1754,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_private_shelf</div>
             </td>
@@ -1787,7 +1763,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_shelf</div>
             </td>
@@ -1796,7 +1772,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_rename_shelf</div>
             </td>
@@ -1805,7 +1781,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -1814,19 +1790,19 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='st16.8' class='none bg-warning'>
+        <tr id='st17.8' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.8')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st17.8')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st16.8' class="popup_window test_output" style="display:none;">
+                <div id='div_st17.8' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st16.8').style.display='none'"><span
+                                onclick="document.getElementById('div_st17.8').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1840,7 +1816,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelf_long_name</div>
             </td>
@@ -1858,13 +1834,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_errors</div>
             </td>
@@ -1873,7 +1849,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_request_errors</div>
             </td>
@@ -1882,7 +1858,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_errors</div>
             </td>
@@ -1891,7 +1867,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_versions</div>
             </td>
@@ -1900,7 +1876,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update</div>
             </td>
@@ -1909,7 +1885,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update_stable_errors</div>
             </td>
@@ -1918,19 +1894,19 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='st17.7' class='none bg-warning'>
+        <tr id='st18.7' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st17.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st18.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st17.7' class="popup_window test_output" style="display:none;">
+                <div id='div_st18.7' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st17.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st18.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1948,18 +1924,18 @@ AssertionError: False is not true : logfile config value is not empty after rese
     <tr class="result['header']['style']">
         <td>test_user_template.test_user_template</td>
         <td class="text-center">19</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 19)">Detail</a>
+            <a onclick="showClassDetail('c19', 19)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_column_restriction</div>
             </td>
@@ -1968,7 +1944,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tag_restriction</div>
             </td>
@@ -1977,46 +1953,16 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='et18.3' class='none bg-info'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_archived_format_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_et18.3' class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_et18.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_user_template.py", line 293, in test_archived_format_template
-    self.fill_view_config({'show_32768':0})
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 377, in fill_view_config
-    ele.clear()
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webelement.py", line 95, in clear
-    self._execute(Command.CLEAR_ELEMENT)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webelement.py", line 633, in _execute
-    return self._parent.execute(command, params)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 321, in execute
-    self.error_handler.check_response(response)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/errorhandler.py", line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.InvalidElementStateException: Message: Unable to clear element that cannot be edited: <input id="show_32768" name="show_32768" type="checkbox"></pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_user_template</div>
             </td>
@@ -2025,7 +1971,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_best_user_template</div>
             </td>
@@ -2034,7 +1980,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_category_user_template</div>
             </td>
@@ -2043,7 +1989,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_column_restriction</div>
             </td>
@@ -2052,7 +1998,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.8' class='hiddenRow bg-success'>
+        <tr id='pt19.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_tag_restriction</div>
             </td>
@@ -2061,7 +2007,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.9' class='hiddenRow bg-success'>
+        <tr id='pt19.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_detail_random_user_template</div>
             </td>
@@ -2070,7 +2016,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.10' class='hiddenRow bg-success'>
+        <tr id='pt19.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_format_user_template</div>
             </td>
@@ -2079,7 +2025,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.11' class='hiddenRow bg-success'>
+        <tr id='pt19.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_hot_user_template</div>
             </td>
@@ -2088,7 +2034,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.12' class='hiddenRow bg-success'>
+        <tr id='pt19.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_language_user_template</div>
             </td>
@@ -2097,7 +2043,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.13' class='hiddenRow bg-success'>
+        <tr id='pt19.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_book_languages</div>
             </td>
@@ -2106,7 +2052,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.14' class='hiddenRow bg-success'>
+        <tr id='pt19.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_publisher_user_template</div>
             </td>
@@ -2115,7 +2061,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.15' class='hiddenRow bg-success'>
+        <tr id='pt19.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_user_template</div>
             </td>
@@ -2124,7 +2070,7 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='pt18.16' class='hiddenRow bg-success'>
+        <tr id='pt19.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_read_user_template</div>
             </td>
@@ -2133,36 +2079,35 @@ selenium.common.exceptions.InvalidElementStateException: Message: Unable to clea
     
     
     
-        <tr id='et18.17' class='none bg-info'>
+        <tr id='pt19.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_recent_user_template</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='ft19.18' class='none bg-danger'>
+            <td>
+                <div class='testcase'>test_series_user_template</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et18.17')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.18')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_et18.17' class="popup_window test_output" style="display:none;">
+                <div id='div_ft19.18' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_et18.17').style.display='none'"><span
+                                onclick="document.getElementById('div_ft19.18').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_user_template.py", line 77, in test_recent_user_template
-    'show_16384': 0, 'show_32678': 0, 'show_2':0
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 376, in fill_view_config
-    ele = cls.driver.find_element_by_id(key)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 978, in find_element
-    'value': value})['value']
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/webdriver.py", line 321, in execute
-    self.error_handler.check_response(response)
-  File "/usr/local/lib/python3.7/dist-packages/selenium/webdriver/remote/errorhandler.py", line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id="show_1024"]</pre>
+  File "/home/matthias/Entwicklung/calibre-web-test/test/test_user_template.py", line 193, in test_series_user_template
+    self.assertTrue(self.check_element_on_page((By.ID, "nav_hot")))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2172,16 +2117,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt18.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>test_series_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.19' class='hiddenRow bg-success'>
+        <tr id='pt19.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ui_language_settings</div>
             </td>
@@ -2199,13 +2135,13 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 25)">Detail</a>
+            <a onclick="showClassDetail('c20', 25)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_about</div>
             </td>
@@ -2214,7 +2150,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_SMTP_Settings</div>
             </td>
@@ -2223,7 +2159,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_add_user</div>
             </td>
@@ -2232,7 +2168,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_password</div>
             </td>
@@ -2241,7 +2177,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_archived</div>
             </td>
@@ -2250,7 +2186,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_authors</div>
             </td>
@@ -2259,7 +2195,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_category</div>
             </td>
@@ -2268,7 +2204,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.8' class='hiddenRow bg-success'>
+        <tr id='pt20.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_file_formats</div>
             </td>
@@ -2277,7 +2213,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.9' class='hiddenRow bg-success'>
+        <tr id='pt20.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_hot</div>
             </td>
@@ -2286,7 +2222,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.10' class='hiddenRow bg-success'>
+        <tr id='pt20.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_language</div>
             </td>
@@ -2295,7 +2231,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.11' class='hiddenRow bg-success'>
+        <tr id='pt20.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_publisher</div>
             </td>
@@ -2304,7 +2240,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.12' class='hiddenRow bg-success'>
+        <tr id='pt20.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rated</div>
             </td>
@@ -2313,7 +2249,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.13' class='hiddenRow bg-success'>
+        <tr id='pt20.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rating</div>
             </td>
@@ -2322,7 +2258,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.14' class='hiddenRow bg-success'>
+        <tr id='pt20.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_read</div>
             </td>
@@ -2331,7 +2267,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.15' class='hiddenRow bg-success'>
+        <tr id='pt20.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_series</div>
             </td>
@@ -2340,7 +2276,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.16' class='hiddenRow bg-success'>
+        <tr id='pt20.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_columns</div>
             </td>
@@ -2349,7 +2285,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.17' class='hiddenRow bg-success'>
+        <tr id='pt20.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tags</div>
             </td>
@@ -2358,7 +2294,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.18' class='hiddenRow bg-success'>
+        <tr id='pt20.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_checked_logged_in</div>
             </td>
@@ -2367,7 +2303,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.19' class='hiddenRow bg-success'>
+        <tr id='pt20.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_books_available</div>
             </td>
@@ -2376,7 +2312,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.20' class='hiddenRow bg-success'>
+        <tr id='pt20.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_columns</div>
             </td>
@@ -2385,7 +2321,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.21' class='hiddenRow bg-success'>
+        <tr id='pt20.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_tags</div>
             </td>
@@ -2394,7 +2330,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.22' class='hiddenRow bg-success'>
+        <tr id='pt20.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_search_functions</div>
             </td>
@@ -2403,7 +2339,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.23' class='hiddenRow bg-success'>
+        <tr id='pt20.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_search_string</div>
             </td>
@@ -2412,7 +2348,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.24' class='hiddenRow bg-success'>
+        <tr id='pt20.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_email_available</div>
             </td>
@@ -2421,7 +2357,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt19.25' class='hiddenRow bg-success'>
+        <tr id='pt20.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_visibility_sidebar</div>
             </td>
@@ -2432,11 +2368,11 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>201</td>
-        <td>189</td>
-        <td>3</td>
+        <td>203</td>
+        <td>195</td>
         <td>2</td>
-        <td>7</td>
+        <td>0</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -2464,7 +2400,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.3.0-46-generic #38~18.04.1-Ubuntu SMP Tue Mar 31 04:17:56 UTC 2020 x86_64 x86_64</td>
+              <td>Linux 5.3.0-51-generic #44~18.04.2-Ubuntu SMP Thu Apr 23 14:27:18 UTC 2020 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -2585,19 +2521,31 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
             <tr>
               <th>lxml</th>
               <td>4.5.0</td>
-              <td>test_edit_books</td>
+              <td>test_edit_additional_books</td>
             </tr>
           
             <tr>
               <th>Pillow</th>
               <td>7.1.2</td>
+              <td>test_edit_additional_books</td>
+            </tr>
+          
+            <tr>
+              <th>rarfile</th>
+              <td>3.1</td>
+              <td>test_edit_additional_books</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.5.0</td>
               <td>test_edit_books</td>
             </tr>
           
             <tr>
-              <th>goodreads</th>
-              <td>0.3.2</td>
-              <td>test_goodreads</td>
+              <th>Pillow</th>
+              <td>7.1.2</td>
+              <td>test_edit_books</td>
             </tr>
           
             <tr>
@@ -2638,7 +2586,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
 </div>
 
 <script>
-    drawCircle(189, 3, 2, 7);
+    drawCircle(195, 2, 0, 6);
 </script>
 
 </div>